From 9a5bc222a176f2ed87adce02ba9cfcd799bb96cc Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 7 May 2017 19:08:14 -0400
Subject: Updated sample html

---
 doc/sample_html/cogapp___init___py.html        |    4 +-
 doc/sample_html/cogapp___main___py.html        |    4 +-
 doc/sample_html/cogapp_backward_py.html        |    4 +-
 doc/sample_html/cogapp_cogapp_py.html          | 1838 +++++++--------
 doc/sample_html/cogapp_makefiles_py.html       |    4 +-
 doc/sample_html/cogapp_test_cogapp_py.html     | 2940 ++++++++++++------------
 doc/sample_html/cogapp_test_makefiles_py.html  |    4 +-
 doc/sample_html/cogapp_test_whiteutils_py.html |    4 +-
 doc/sample_html/cogapp_whiteutils_py.html      |    4 +-
 doc/sample_html/index.html                     |   32 +-
 doc/sample_html/status.json                    |    2 +-
 11 files changed, 2453 insertions(+), 2387 deletions(-)

(limited to 'doc/sample_html')

diff --git a/doc/sample_html/cogapp___init___py.html b/doc/sample_html/cogapp___init___py.html
index a4353850..4e33ca0f 100644
--- a/doc/sample_html/cogapp___init___py.html
+++ b/doc/sample_html/cogapp___init___py.html
@@ -99,8 +99,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp___main___py.html b/doc/sample_html/cogapp___main___py.html
index 7a1c0660..8545585e 100644
--- a/doc/sample_html/cogapp___main___py.html
+++ b/doc/sample_html/cogapp___main___py.html
@@ -91,8 +91,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_backward_py.html b/doc/sample_html/cogapp_backward_py.html
index 0a989346..cafc687b 100644
--- a/doc/sample_html/cogapp_backward_py.html
+++ b/doc/sample_html/cogapp_backward_py.html
@@ -133,8 +133,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_cogapp_py.html b/doc/sample_html/cogapp_cogapp_py.html
index 3d730b9e..378bf12c 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.10%</title>
+    <title>Coverage for cogapp/cogapp.py: 47.12%</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.10%</span>
+            <span class="pc_cov">47.12%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
-            427 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">230 run</span>
-            <span class="mis shortkey_m button_toggle_mis">197 missing</span>
+            429 statements &nbsp;
+            <span class="run hide_run shortkey_r button_toggle_run">231 run</span>
+            <span class="mis shortkey_m button_toggle_mis">198 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">27 partial</span>
             
         </h2>
     </div>
@@ -240,47 +240,47 @@
 <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="stm run hide_run"><a href="#n172">172</a></p>
-<p id="n173" class="pln"><a href="#n173">173</a></p>
+<p id="n172" class="stm par run hide_run"><a href="#n172">172</a></p>
+<p id="n173" class="stm mis"><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="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="stm run hide_run"><a href="#n178">178</a></p>
-<p id="n179" class="pln"><a href="#n179">179</a></p>
+<p id="n176" class="stm run hide_run"><a href="#n176">176</a></p>
+<p id="n177" class="pln"><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="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="n182" class="stm run hide_run"><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="pln"><a href="#n185">185</a></p>
-<p id="n186" class="stm mis"><a href="#n186">186</a></p>
+<p id="n186" class="pln"><a href="#n186">186</a></p>
 <p id="n187" class="pln"><a href="#n187">187</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="n188" class="stm mis"><a href="#n188">188</a></p>
+<p id="n189" class="pln"><a href="#n189">189</a></p>
 <p id="n190" class="pln"><a href="#n190">190</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="n191" class="stm run hide_run"><a href="#n191">191</a></p>
+<p id="n192" class="pln"><a href="#n192">192</a></p>
+<p id="n193" class="pln"><a href="#n193">193</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="n195" class="stm run hide_run"><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="n197" class="pln"><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="stm run hide_run"><a href="#n200">200</a></p>
-<p id="n201" class="pln"><a href="#n201">201</a></p>
+<p id="n201" class="stm run hide_run"><a href="#n201">201</a></p>
 <p id="n202" class="stm run hide_run"><a href="#n202">202</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="pln"><a href="#n205">205</a></p>
-<p id="n206" class="stm run hide_run"><a href="#n206">206</a></p>
+<p id="n203" class="pln"><a href="#n203">203</a></p>
+<p id="n204" class="stm run hide_run"><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="n207" class="pln"><a href="#n207">207</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="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="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="n212" class="pln"><a href="#n212">212</a></p>
 <p id="n213" class="stm run hide_run"><a href="#n213">213</a></p>
 <p id="n214" class="stm run hide_run"><a href="#n214">214</a></p>
 <p id="n215" class="stm run hide_run"><a href="#n215">215</a></p>
@@ -298,40 +298,40 @@
 <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="stm run hide_run"><a href="#n229">229</a></p>
-<p id="n230" class="pln"><a href="#n230">230</a></p>
+<p id="n230" class="stm run hide_run"><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="pln"><a href="#n233">233</a></p>
-<p id="n234" class="stm mis"><a href="#n234">234</a></p>
+<p id="n233" class="stm run hide_run"><a href="#n233">233</a></p>
+<p id="n234" class="pln"><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="n236" class="stm mis"><a href="#n236">236</a></p>
 <p id="n237" class="pln"><a href="#n237">237</a></p>
-<p id="n238" class="pln"><a href="#n238">238</a></p>
-<p id="n239" class="stm mis"><a href="#n239">239</a></p>
+<p id="n238" class="stm run hide_run"><a href="#n238">238</a></p>
+<p id="n239" class="pln"><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="n241" class="stm mis"><a href="#n241">241</a></p>
 <p id="n242" class="pln"><a href="#n242">242</a></p>
-<p id="n243" class="pln"><a href="#n243">243</a></p>
-<p id="n244" class="stm mis"><a href="#n244">244</a></p>
-<p id="n245" class="stm mis"><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="n243" class="stm run hide_run"><a href="#n243">243</a></p>
+<p id="n244" class="pln"><a href="#n244">244</a></p>
+<p id="n245" class="pln"><a href="#n245">245</a></p>
+<p id="n246" class="stm mis"><a href="#n246">246</a></p>
+<p id="n247" class="stm mis"><a href="#n247">247</a></p>
 <p id="n248" class="pln"><a href="#n248">248</a></p>
-<p id="n249" class="stm mis"><a href="#n249">249</a></p>
-<p id="n250" class="stm mis"><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="n249" class="stm run hide_run"><a href="#n249">249</a></p>
+<p id="n250" class="pln"><a href="#n250">250</a></p>
+<p id="n251" class="stm mis"><a href="#n251">251</a></p>
+<p id="n252" class="stm mis"><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="pln"><a href="#n257">257</a></p>
-<p id="n258" class="stm mis"><a href="#n258">258</a></p>
-<p id="n259" class="stm mis"><a href="#n259">259</a></p>
-<p id="n260" class="pln"><a href="#n260">260</a></p>
-<p id="n261" class="pln"><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="n258" class="pln"><a href="#n258">258</a></p>
+<p id="n259" class="pln"><a href="#n259">259</a></p>
+<p id="n260" class="stm mis"><a href="#n260">260</a></p>
+<p id="n261" class="stm mis"><a href="#n261">261</a></p>
+<p id="n262" class="pln"><a href="#n262">262</a></p>
+<p id="n263" class="pln"><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>
@@ -366,334 +366,334 @@
 <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="stm mis"><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="n298" class="stm mis"><a href="#n298">298</a></p>
+<p id="n299" class="stm mis"><a href="#n299">299</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="n301" class="pln"><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 mis"><a href="#n304">304</a></p>
-<p id="n305" class="stm mis"><a href="#n305">305</a></p>
+<p id="n303" class="exc"><a href="#n303">303</a></p>
+<p id="n304" class="pln"><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 mis"><a href="#n306">306</a></p>
 <p id="n307" class="stm mis"><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="n308" class="stm mis"><a href="#n308">308</a></p>
+<p id="n309" class="stm mis"><a href="#n309">309</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="n311" class="pln"><a href="#n311">311</a></p>
 <p id="n312" class="pln"><a href="#n312">312</a></p>
-<p id="n313" class="pln"><a href="#n313">313</a></p>
-<p id="n314" class="stm mis"><a href="#n314">314</a></p>
-<p id="n315" class="stm mis"><a href="#n315">315</a></p>
-<p id="n316" class="pln"><a href="#n316">316</a></p>
+<p id="n313" class="stm run hide_run"><a href="#n313">313</a></p>
+<p id="n314" class="pln"><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="stm mis"><a href="#n318">318</a></p>
-<p id="n319" class="pln"><a href="#n319">319</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="n318" class="pln"><a href="#n318">318</a></p>
+<p id="n319" class="stm mis"><a href="#n319">319</a></p>
+<p id="n320" class="stm mis"><a href="#n320">320</a></p>
+<p id="n321" class="pln"><a href="#n321">321</a></p>
 <p id="n322" class="pln"><a href="#n322">322</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="n323" class="stm run hide_run"><a href="#n323">323</a></p>
+<p id="n324" class="pln"><a href="#n324">324</a></p>
+<p id="n325" class="pln"><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="stm run hide_run"><a href="#n328">328</a></p>
-<p id="n329" class="pln"><a href="#n329">329</a></p>
+<p id="n329" class="stm run hide_run"><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="n331" class="pln"><a href="#n331">331</a></p>
 <p id="n332" class="stm run hide_run"><a href="#n332">332</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="n334" class="stm run hide_run"><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 mis"><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="stm run hide_run"><a href="#n339">339</a></p>
-<p id="n340" class="pln"><a href="#n340">340</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="n338" class="stm mis"><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="n341" class="stm run hide_run"><a href="#n341">341</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="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="n344" class="stm run hide_run"><a href="#n344">344</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="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="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="n349" class="stm run hide_run"><a href="#n349">349</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="n351" class="pln"><a href="#n351">351</a></p>
+<p id="n352" class="pln"><a href="#n352">352</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="n354" class="stm run hide_run"><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="pln"><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="n357" class="stm run hide_run"><a href="#n357">357</a></p>
+<p id="n358" class="pln"><a href="#n358">358</a></p>
+<p id="n359" class="pln"><a href="#n359">359</a></p>
 <p id="n360" class="stm mis"><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="stm mis"><a href="#n364">364</a></p>
-<p id="n365" class="pln"><a href="#n365">365</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="stm mis"><a href="#n367">367</a></p>
+<p id="n367" class="pln"><a href="#n367">367</a></p>
 <p id="n368" class="stm mis"><a href="#n368">368</a></p>
 <p id="n369" class="stm mis"><a href="#n369">369</a></p>
 <p id="n370" class="stm mis"><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="n371" class="stm mis"><a href="#n371">371</a></p>
+<p id="n372" class="stm mis"><a href="#n372">372</a></p>
 <p id="n373" class="pln"><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="pln"><a href="#n376">376</a></p>
+<p id="n374" class="stm run hide_run"><a href="#n374">374</a></p>
+<p id="n375" class="pln"><a href="#n375">375</a></p>
+<p id="n376" class="stm mis"><a href="#n376">376</a></p>
 <p id="n377" class="stm mis"><a href="#n377">377</a></p>
-<p id="n378" class="stm mis"><a href="#n378">378</a></p>
+<p id="n378" class="pln"><a href="#n378">378</a></p>
 <p id="n379" class="stm mis"><a href="#n379">379</a></p>
 <p id="n380" class="stm mis"><a href="#n380">380</a></p>
-<p id="n381" class="pln"><a href="#n381">381</a></p>
-<p id="n382" class="stm run hide_run"><a href="#n382">382</a></p>
+<p id="n381" class="stm mis"><a href="#n381">381</a></p>
+<p id="n382" class="stm mis"><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="n384" class="stm run hide_run"><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 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="n387" class="pln"><a href="#n387">387</a></p>
+<p id="n388" class="pln"><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 par run hide_run"><a href="#n391">391</a></p>
+<p id="n390" class="stm run hide_run"><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="stm par 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 mis"><a href="#n397">397</a></p>
-<p id="n398" class="stm mis"><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="pln"><a href="#n402">402</a></p>
+<p id="n393" class="stm par run hide_run"><a href="#n393">393</a></p>
+<p id="n394" class="pln"><a href="#n394">394</a></p>
+<p id="n395" class="stm mis"><a href="#n395">395</a></p>
+<p id="n396" class="stm mis"><a href="#n396">396</a></p>
+<p id="n397" class="stm par 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 mis"><a href="#n399">399</a></p>
+<p id="n400" class="stm mis"><a href="#n400">400</a></p>
+<p id="n401" class="pln"><a href="#n401">401</a></p>
+<p id="n402" class="stm run hide_run"><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 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 par run hide_run"><a href="#n409">409</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="pln"><a href="#n412">412</a></p>
-<p id="n413" class="stm run hide_run"><a href="#n413">413</a></p>
+<p id="n406" class="pln"><a href="#n406">406</a></p>
+<p id="n407" class="stm run hide_run"><a href="#n407">407</a></p>
+<p id="n408" class="stm run hide_run"><a href="#n408">408</a></p>
+<p id="n409" class="pln"><a href="#n409">409</a></p>
+<p id="n410" class="pln"><a href="#n410">410</a></p>
+<p id="n411" class="stm par run hide_run"><a href="#n411">411</a></p>
+<p id="n412" class="stm run hide_run"><a href="#n412">412</a></p>
+<p id="n413" class="pln"><a href="#n413">413</a></p>
 <p id="n414" class="pln"><a href="#n414">414</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="n415" class="stm run hide_run"><a href="#n415">415</a></p>
+<p id="n416" class="pln"><a href="#n416">416</a></p>
+<p id="n417" class="pln"><a href="#n417">417</a></p>
+<p id="n418" class="stm run hide_run"><a href="#n418">418</a></p>
 <p id="n419" class="stm run hide_run"><a href="#n419">419</a></p>
-<p id="n420" class="stm par run hide_run"><a href="#n420">420</a></p>
-<p id="n421" class="stm mis"><a href="#n421">421</a></p>
-<p id="n422" class="pln"><a href="#n422">422</a></p>
-<p id="n423" class="stm par run hide_run"><a href="#n423">423</a></p>
-<p id="n424" class="stm mis"><a href="#n424">424</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="n420" class="pln"><a href="#n420">420</a></p>
+<p id="n421" class="stm run hide_run"><a href="#n421">421</a></p>
+<p id="n422" class="stm par run hide_run"><a href="#n422">422</a></p>
+<p id="n423" class="stm mis"><a href="#n423">423</a></p>
+<p id="n424" class="pln"><a href="#n424">424</a></p>
+<p id="n425" class="stm par run hide_run"><a href="#n425">425</a></p>
+<p id="n426" class="stm mis"><a href="#n426">426</a></p>
+<p id="n427" class="pln"><a href="#n427">427</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 par run hide_run"><a href="#n430">430</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="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="stm run hide_run"><a href="#n435">435</a></p>
+<p id="n432" class="stm par 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="pln"><a href="#n434">434</a></p>
+<p id="n435" class="pln"><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="pln"><a href="#n440">440</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="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="stm run hide_run"><a href="#n443">443</a></p>
+<p id="n442" class="pln"><a href="#n442">442</a></p>
+<p id="n443" class="pln"><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="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="pln"><a href="#n452">452</a></p>
-<p id="n453" class="stm run hide_run"><a href="#n453">453</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="pln"><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="stm run hide_run"><a href="#n452">452</a></p>
+<p id="n453" class="pln"><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 run hide_run"><a href="#n456">456</a></p>
-<p id="n457" class="stm par run hide_run"><a href="#n457">457</a></p>
-<p id="n458" class="stm mis"><a href="#n458">458</a></p>
-<p id="n459" class="pln"><a href="#n459">459</a></p>
-<p id="n460" class="stm par run hide_run"><a href="#n460">460</a></p>
-<p id="n461" class="stm mis"><a href="#n461">461</a></p>
-<p id="n462" class="pln"><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 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="n455" class="stm run hide_run"><a href="#n455">455</a></p>
+<p id="n456" class="pln"><a href="#n456">456</a></p>
+<p id="n457" class="pln"><a href="#n457">457</a></p>
+<p id="n458" class="stm run hide_run"><a href="#n458">458</a></p>
+<p id="n459" class="stm par 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="pln"><a href="#n461">461</a></p>
+<p id="n462" class="stm par run hide_run"><a href="#n462">462</a></p>
+<p id="n463" class="stm mis"><a href="#n463">463</a></p>
+<p id="n464" class="pln"><a href="#n464">464</a></p>
+<p id="n465" class="stm par 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 par run hide_run"><a href="#n467">467</a></p>
-<p id="n468" class="stm mis"><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="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 par run hide_run"><a href="#n469">469</a></p>
+<p id="n470" class="stm mis"><a href="#n470">470</a></p>
 <p id="n471" class="pln"><a href="#n471">471</a></p>
-<p id="n472" class="stm par run hide_run"><a href="#n472">472</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="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 par run hide_run"><a href="#n474">474</a></p>
+<p id="n475" class="stm run hide_run"><a href="#n475">475</a></p>
 <p id="n476" class="stm run hide_run"><a href="#n476">476</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="n478" class="stm run hide_run"><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="n480" class="pln"><a href="#n480">480</a></p>
+<p id="n481" class="pln"><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 par run hide_run"><a href="#n483">483</a></p>
-<p id="n484" class="stm mis"><a href="#n484">484</a></p>
-<p id="n485" class="pln"><a href="#n485">485</a></p>
-<p id="n486" class="stm par run hide_run"><a href="#n486">486</a></p>
-<p id="n487" class="stm mis"><a href="#n487">487</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="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="stm par run hide_run"><a href="#n485">485</a></p>
+<p id="n486" class="stm mis"><a href="#n486">486</a></p>
+<p id="n487" class="pln"><a href="#n487">487</a></p>
+<p id="n488" class="stm par run hide_run"><a href="#n488">488</a></p>
+<p id="n489" class="stm mis"><a href="#n489">489</a></p>
+<p id="n490" class="pln"><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="stm par run hide_run"><a href="#n494">494</a></p>
+<p id="n493" class="stm run hide_run"><a href="#n493">493</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 mis"><a href="#n496">496</a></p>
+<p id="n496" class="stm par 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="n498" class="stm mis"><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="n500" class="pln"><a href="#n500">500</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="n502" class="stm run hide_run"><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 par run hide_run"><a href="#n505">505</a></p>
+<p id="n504" class="pln"><a href="#n504">504</a></p>
+<p id="n505" class="pln"><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="n507" class="stm par run hide_run"><a href="#n507">507</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="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="n512" class="stm run hide_run"><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 par run hide_run"><a href="#n517">517</a></p>
-<p id="n518" class="stm mis"><a href="#n518">518</a></p>
-<p id="n519" class="stm mis"><a href="#n519">519</a></p>
+<p id="n515" class="stm run hide_run"><a href="#n515">515</a></p>
+<p id="n516" class="pln"><a href="#n516">516</a></p>
+<p id="n517" class="pln"><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 par run hide_run"><a href="#n519">519</a></p>
 <p id="n520" class="stm mis"><a href="#n520">520</a></p>
 <p id="n521" class="stm mis"><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="stm mis"><a href="#n524">524</a></p>
+<p id="n522" class="stm mis"><a href="#n522">522</a></p>
+<p id="n523" class="stm mis"><a href="#n523">523</a></p>
+<p id="n524" class="pln"><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="stm mis"><a href="#n527">527</a></p>
-<p id="n528" class="stm mis"><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="n526" class="stm mis"><a href="#n526">526</a></p>
+<p id="n527" class="pln"><a href="#n527">527</a></p>
+<p id="n528" class="pln"><a href="#n528">528</a></p>
+<p id="n529" class="stm mis"><a href="#n529">529</a></p>
+<p id="n530" class="stm mis"><a href="#n530">530</a></p>
 <p id="n531" class="pln"><a href="#n531">531</a></p>
-<p id="n532" class="stm par run hide_run"><a href="#n532">532</a></p>
-<p id="n533" class="stm mis"><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 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 par run hide_run"><a href="#n539">539</a></p>
-<p id="n540" class="stm mis"><a href="#n540">540</a></p>
-<p id="n541" class="pln"><a href="#n541">541</a></p>
-<p id="n542" class="stm par run hide_run"><a href="#n542">542</a></p>
-<p id="n543" class="stm mis"><a href="#n543">543</a></p>
+<p id="n532" class="pln"><a href="#n532">532</a></p>
+<p id="n533" class="pln"><a href="#n533">533</a></p>
+<p id="n534" class="stm par run hide_run"><a href="#n534">534</a></p>
+<p id="n535" class="stm mis"><a href="#n535">535</a></p>
+<p id="n536" class="pln"><a href="#n536">536</a></p>
+<p id="n537" class="stm par run hide_run"><a href="#n537">537</a></p>
+<p id="n538" class="stm run hide_run"><a href="#n538">538</a></p>
+<p id="n539" class="stm run hide_run"><a href="#n539">539</a></p>
+<p id="n540" class="pln"><a href="#n540">540</a></p>
+<p id="n541" class="stm par run hide_run"><a href="#n541">541</a></p>
+<p id="n542" class="stm mis"><a href="#n542">542</a></p>
+<p id="n543" class="pln"><a href="#n543">543</a></p>
 <p id="n544" class="stm par run hide_run"><a href="#n544">544</a></p>
 <p id="n545" class="stm mis"><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="n546" class="stm par run hide_run"><a href="#n546">546</a></p>
+<p id="n547" class="stm mis"><a href="#n547">547</a></p>
 <p id="n548" class="pln"><a href="#n548">548</a></p>
-<p id="n549" class="stm run hide_run"><a href="#n549">549</a></p>
+<p id="n549" class="pln"><a href="#n549">549</a></p>
 <p id="n550" class="pln"><a href="#n550">550</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="pln"><a href="#n553">553</a></p>
+<p id="n553" class="stm run hide_run"><a href="#n553">553</a></p>
 <p id="n554" class="pln"><a href="#n554">554</a></p>
-<p id="n555" class="stm par run hide_run"><a href="#n555">555</a></p>
+<p id="n555" class="pln"><a href="#n555">555</a></p>
 <p id="n556" class="pln"><a href="#n556">556</a></p>
-<p id="n557" class="stm mis"><a href="#n557">557</a></p>
-<p id="n558" class="stm mis"><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="n557" class="stm par run hide_run"><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="n560" class="stm mis"><a href="#n560">560</a></p>
 <p id="n561" class="stm run hide_run"><a href="#n561">561</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="n563" class="stm run hide_run"><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="n565" class="pln"><a href="#n565">565</a></p>
+<p id="n566" class="pln"><a href="#n566">566</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="n569" class="stm run hide_run"><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="n572" class="stm run hide_run"><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>
 <p id="n575" class="stm mis"><a href="#n575">575</a></p>
 <p id="n576" class="pln"><a href="#n576">576</a></p>
 <p id="n577" class="stm mis"><a href="#n577">577</a></p>
-<p id="n578" class="stm mis"><a href="#n578">578</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="pln"><a href="#n581">581</a></p>
-<p id="n582" class="pln"><a href="#n582">582</a></p>
-<p id="n583" class="stm mis"><a href="#n583">583</a></p>
-<p id="n584" class="stm mis"><a href="#n584">584</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="n584" class="pln"><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="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="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 mis"><a href="#n593">593</a></p>
-<p id="n594" class="stm mis"><a href="#n594">594</a></p>
+<p id="n587" class="stm mis"><a href="#n587">587</a></p>
+<p id="n588" class="stm mis"><a href="#n588">588</a></p>
+<p id="n589" class="pln"><a href="#n589">589</a></p>
+<p id="n590" class="stm run hide_run"><a href="#n590">590</a></p>
+<p id="n591" class="stm mis"><a href="#n591">591</a></p>
+<p id="n592" class="stm mis"><a href="#n592">592</a></p>
+<p id="n593" class="pln"><a href="#n593">593</a></p>
+<p id="n594" class="stm run hide_run"><a href="#n594">594</a></p>
 <p id="n595" class="stm mis"><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="stm mis"><a href="#n598">598</a></p>
-<p id="n599" class="stm mis"><a href="#n599">599</a></p>
-<p id="n600" class="pln"><a href="#n600">600</a></p>
-<p id="n601" class="stm run hide_run"><a href="#n601">601</a></p>
+<p id="n596" class="stm mis"><a href="#n596">596</a></p>
+<p id="n597" class="stm mis"><a href="#n597">597</a></p>
+<p id="n598" class="pln"><a href="#n598">598</a></p>
+<p id="n599" class="stm run hide_run"><a href="#n599">599</a></p>
+<p id="n600" class="stm mis"><a href="#n600">600</a></p>
+<p id="n601" class="stm mis"><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="n603" class="stm run hide_run"><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="n606" class="stm mis"><a href="#n606">606</a></p>
-<p id="n607" class="pln"><a href="#n607">607</a></p>
+<p id="n605" class="pln"><a href="#n605">605</a></p>
+<p id="n606" class="pln"><a href="#n606">606</a></p>
+<p id="n607" class="stm mis"><a href="#n607">607</a></p>
 <p id="n608" class="stm mis"><a href="#n608">608</a></p>
-<p id="n609" class="stm mis"><a href="#n609">609</a></p>
-<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 mis"><a href="#n612">612</a></p>
+<p id="n609" class="pln"><a href="#n609">609</a></p>
+<p id="n610" class="stm mis"><a href="#n610">610</a></p>
+<p id="n611" class="stm mis"><a href="#n611">611</a></p>
+<p id="n612" class="pln"><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="stm mis"><a href="#n615">615</a></p>
-<p id="n616" class="stm mis"><a href="#n616">616</a></p>
+<p id="n614" class="stm mis"><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="stm mis"><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="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="pln"><a href="#n620">620</a></p>
+<p id="n621" class="pln"><a href="#n621">621</a></p>
 <p id="n622" class="stm mis"><a href="#n622">622</a></p>
-<p id="n623" class="pln"><a href="#n623">623</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="n625" class="pln"><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>
@@ -704,85 +704,85 @@
 <p id="n633" class="stm mis"><a href="#n633">633</a></p>
 <p id="n634" class="stm mis"><a href="#n634">634</a></p>
 <p id="n635" class="stm mis"><a href="#n635">635</a></p>
-<p id="n636" class="pln"><a href="#n636">636</a></p>
-<p id="n637" class="pln"><a href="#n637">637</a></p>
+<p id="n636" class="stm mis"><a href="#n636">636</a></p>
+<p id="n637" class="stm mis"><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="pln"><a href="#n640">640</a></p>
-<p id="n641" class="stm mis"><a href="#n641">641</a></p>
-<p id="n642" class="stm mis"><a href="#n642">642</a></p>
-<p id="n643" class="pln"><a href="#n643">643</a></p>
+<p id="n641" class="pln"><a href="#n641">641</a></p>
+<p id="n642" class="pln"><a href="#n642">642</a></p>
+<p id="n643" class="stm mis"><a href="#n643">643</a></p>
 <p id="n644" class="stm mis"><a href="#n644">644</a></p>
 <p id="n645" class="pln"><a href="#n645">645</a></p>
 <p id="n646" class="stm mis"><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="n648" class="stm mis"><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 mis"><a href="#n651">651</a></p>
-<p id="n652" class="stm mis"><a href="#n652">652</a></p>
+<p id="n650" class="stm run hide_run"><a href="#n650">650</a></p>
+<p id="n651" class="pln"><a href="#n651">651</a></p>
+<p id="n652" class="pln"><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="n655" class="pln"><a href="#n655">655</a></p>
+<p id="n655" class="stm mis"><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="n657" class="pln"><a href="#n657">657</a></p>
 <p id="n658" class="stm mis"><a href="#n658">658</a></p>
-<p id="n659" class="pln"><a href="#n659">659</a></p>
+<p id="n659" class="stm mis"><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="n661" class="pln"><a href="#n661">661</a></p>
 <p id="n662" class="stm mis"><a href="#n662">662</a></p>
 <p id="n663" class="stm mis"><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="n664" class="stm mis"><a href="#n664">664</a></p>
+<p id="n665" class="stm mis"><a href="#n665">665</a></p>
 <p id="n666" class="pln"><a href="#n666">666</a></p>
-<p id="n667" class="pln"><a href="#n667">667</a></p>
-<p id="n668" class="stm mis"><a href="#n668">668</a></p>
-<p id="n669" class="stm mis"><a href="#n669">669</a></p>
-<p id="n670" class="pln"><a href="#n670">670</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="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="pln"><a href="#n673">673</a></p>
+<p id="n672" class="pln"><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="n675" class="stm mis"><a href="#n675">675</a></p>
+<p id="n675" class="pln"><a href="#n675">675</a></p>
 <p id="n676" class="stm mis"><a href="#n676">676</a></p>
 <p id="n677" class="stm mis"><a href="#n677">677</a></p>
-<p id="n678" class="pln"><a href="#n678">678</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="pln"><a href="#n680">680</a></p>
 <p id="n681" class="stm mis"><a href="#n681">681</a></p>
 <p id="n682" class="pln"><a href="#n682">682</a></p>
-<p id="n683" class="stm run hide_run"><a href="#n683">683</a></p>
+<p id="n683" class="stm mis"><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="n685" class="stm run hide_run"><a href="#n685">685</a></p>
 <p id="n686" class="pln"><a href="#n686">686</a></p>
 <p id="n687" class="pln"><a href="#n687">687</a></p>
-<p id="n688" class="stm mis"><a href="#n688">688</a></p>
+<p id="n688" class="pln"><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="n690" class="stm mis"><a href="#n690">690</a></p>
+<p id="n691" class="pln"><a href="#n691">691</a></p>
+<p id="n692" class="pln"><a href="#n692">692</a></p>
 <p id="n693" class="stm mis"><a href="#n693">693</a></p>
-<p id="n694" class="pln"><a href="#n694">694</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="n696" class="pln"><a href="#n696">696</a></p>
 <p id="n697" class="stm mis"><a href="#n697">697</a></p>
-<p id="n698" class="pln"><a href="#n698">698</a></p>
+<p id="n698" class="stm mis"><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="n700" class="pln"><a href="#n700">700</a></p>
 <p id="n701" class="stm mis"><a href="#n701">701</a></p>
-<p id="n702" class="pln"><a href="#n702">702</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="n704" class="pln"><a href="#n704">704</a></p>
 <p id="n705" class="stm mis"><a href="#n705">705</a></p>
-<p id="n706" class="pln"><a href="#n706">706</a></p>
+<p id="n706" class="stm mis"><a href="#n706">706</a></p>
 <p id="n707" class="stm mis"><a href="#n707">707</a></p>
 <p id="n708" class="pln"><a href="#n708">708</a></p>
-<p id="n709" class="stm run hide_run"><a href="#n709">709</a></p>
+<p id="n709" class="stm mis"><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="n711" class="stm run hide_run"><a href="#n711">711</a></p>
 <p id="n712" class="pln"><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="n713" class="pln"><a href="#n713">713</a></p>
+<p id="n714" class="pln"><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>
@@ -797,8 +797,8 @@
 <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="n728" class="stm mis"><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="n729" class="stm mis"><a href="#n729">729</a></p>
+<p id="n730" class="stm mis"><a href="#n730">730</a></p>
 <p id="n731" class="pln"><a href="#n731">731</a></p>
 <p id="n732" class="pln"><a href="#n732">732</a></p>
 <p id="n733" class="pln"><a href="#n733">733</a></p>
@@ -850,6 +850,8 @@
 <p id="n779" class="pln"><a href="#n779">779</a></p>
 <p id="n780" class="pln"><a href="#n780">780</a></p>
 <p id="n781" class="pln"><a href="#n781">781</a></p>
+<p id="n782" class="pln"><a href="#n782">782</a></p>
+<p id="n783" class="pln"><a href="#n783">783</a></p>
 
             </td>
             <td class="text">
@@ -1024,616 +1026,618 @@
 <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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t173" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t175" class="pln">        <span class="str">""" The cog.outl function.</span><span class="strut">&nbsp;</span></p>
-<p id="t176" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t179" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t181" class="pln">        <span class="str">""" The cog.error function.</span><span class="strut">&nbsp;</span></p>
-<p id="t182" class="pln"><span class="str">            Instead of raising standard python errors, cog generators can use</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t184" class="pln"><span class="str">            traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t185" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t186" 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">&nbsp;</span></p>
-<p id="t187" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t188" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t190" class="pln">    <span class="str">""" A decorator for files that counts the readline()'s called.</span><span class="strut">&nbsp;</span></p>
-<p id="t191" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t195" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t200" class="stm run hide_run">        <span class="key">return</span> <span class="nam">l</span><span class="strut">&nbsp;</span></p>
-<p id="t201" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t204" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t205" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t207" class="pln">    <span class="str">""" Options for a run of cog.</span><span class="strut">&nbsp;</span></p>
-<p id="t208" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t210" class="pln">        <span class="com"># Defaults for argument values.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t230" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t232" class="pln">        <span class="str">""" Comparison operator for tests to use.</span><span class="strut">&nbsp;</span></p>
-<p id="t233" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t234" 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">&nbsp;</span></p>
-<p id="t235" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t237" class="pln">        <span class="str">""" Make a clone of these options, for further refinement.</span><span class="strut">&nbsp;</span></p>
-<p id="t238" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t239" 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">&nbsp;</span></p>
-<p id="t240" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t242" class="pln">        <span class="str">""" Add directories to the include path.</span><span class="strut">&nbsp;</span></p>
-<p id="t243" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t244" 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">&nbsp;</span></p>
-<p id="t245" 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">&nbsp;</span></p>
-<p id="t246" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t248" class="pln">        <span class="com"># Parse the command line arguments.</span><span class="strut">&nbsp;</span></p>
-<p id="t249" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t250" 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">&nbsp;</span></p>
-<p id="t251" class="pln">                <span class="nam">argv</span><span class="op">,</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t253" class="pln">                <span class="op">[</span><span class="strut">&nbsp;</span></p>
-<p id="t254" class="pln">                    <span class="str">'markers='</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t255" class="pln">                    <span class="str">'verbosity='</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t256" class="pln">                <span class="op">]</span><span class="strut">&nbsp;</span></p>
-<p id="t257" class="pln">            <span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t258" 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">&nbsp;</span></p>
-<p id="t259" 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">&nbsp;</span></p>
-<p id="t260" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t261" class="pln">        <span class="com"># Handle the command line arguments.</span><span class="strut">&nbsp;</span></p>
-<p id="t262" 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">&nbsp;</span></p>
-<p id="t263" 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">&nbsp;</span></p>
-<p id="t264" 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">&nbsp;</span></p>
-<p id="t265" 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">&nbsp;</span></p>
-<p id="t266" 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">&nbsp;</span></p>
-<p id="t267" 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">&nbsp;</span></p>
-<p id="t268" 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">&lt;</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t269" 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">&nbsp;</span></p>
-<p id="t270" 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">&nbsp;</span></p>
-<p id="t271" 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">&nbsp;</span></p>
-<p id="t272" 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">&nbsp;</span></p>
-<p id="t273" 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">&nbsp;</span></p>
-<p id="t274" 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">&nbsp;</span></p>
-<p id="t275" 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">&nbsp;</span></p>
-<p id="t276" 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">&nbsp;</span></p>
-<p id="t277" 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">&nbsp;</span></p>
-<p id="t278" 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">&nbsp;</span></p>
-<p id="t279" 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">&nbsp;</span></p>
-<p id="t280" 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">&nbsp;</span></p>
-<p id="t281" 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">&nbsp;</span></p>
-<p id="t282" 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">&nbsp;</span></p>
-<p id="t283" 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">&nbsp;</span></p>
-<p id="t284" 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">&nbsp;</span></p>
-<p id="t285" 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">&nbsp;</span></p>
-<p id="t286" 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">&nbsp;</span></p>
-<p id="t287" 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">&nbsp;</span></p>
-<p id="t288" 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">&nbsp;</span></p>
-<p id="t289" 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">&nbsp;</span></p>
-<p id="t290" 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">&nbsp;</span></p>
-<p id="t291" 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">&nbsp;</span></p>
-<p id="t292" 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">&nbsp;</span></p>
-<p id="t293" 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">&nbsp;</span></p>
-<p id="t294" 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">&nbsp;</span></p>
-<p id="t295" 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">&nbsp;</span></p>
-<p id="t296" 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">&nbsp;</span></p>
-<p id="t297" 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">&nbsp;</span></p>
-<p id="t298" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t299" class="pln">                <span class="com"># Since getopt.getopt is given a list of possible flags,</span><span class="strut">&nbsp;</span></p>
-<p id="t300" class="pln">                <span class="com"># this is an internal error.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t302" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t304" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t305" 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">&nbsp;</span></p>
-<p id="t306" class="stm mis">        <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t307" class="stm mis">            <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t309" class="pln">            <span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t310" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t313" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t314" 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">&nbsp;</span></p>
-<p id="t315" 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">&nbsp;</span></p>
-<p id="t316" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t317" 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">&nbsp;</span></p>
-<p id="t318" 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">&nbsp;</span></p>
-<p id="t319" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t320" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t322" class="pln">    <span class="str">""" The Cog engine.</span><span class="strut">&nbsp;</span></p>
-<p id="t323" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t329" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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&lt;hashsect> *\(checksum: (?P&lt;hash>[a-f0-9]+)\))'</span><span class="op">)</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t334" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t336" 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">&nbsp;</span></p>
-<p id="t337" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t340" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t343" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t346" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t348" class="pln">        <span class="str">""" Magic mumbo-jumbo so that imported Python modules</span><span class="strut">&nbsp;</span></p>
-<p id="t349" class="pln"><span class="str">            can say "import cog" and get our state.</span><span class="strut">&nbsp;</span></p>
-<p id="t350" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t354" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t356" class="pln">        <span class="str">""" Open an output file, taking all the details into account.</span><span class="strut">&nbsp;</span></p>
-<p id="t357" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t358" class="stm mis">        <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t359" class="stm mis">        <span class="nam">mode</span> <span class="op">=</span> <span class="str">"w"</span><span class="strut">&nbsp;</span></p>
-<p id="t360" class="stm mis">        <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t362" 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">&nbsp;</span></p>
-<p id="t363" class="stm mis">            <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t365" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t366" class="stm mis">                <span class="nam">mode</span> <span class="op">=</span> <span class="str">"wb"</span><span class="strut">&nbsp;</span></p>
-<p id="t367" class="stm mis">        <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">&nbsp;</span></p>
-<p id="t368" class="stm mis">        <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">&nbsp;</span></p>
-<p id="t369" class="stm mis">            <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">&nbsp;</span></p>
-<p id="t370" 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">&nbsp;</span></p>
-<p id="t371" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t373" class="pln">        <span class="str">""" Open an input file. """</span><span class="strut">&nbsp;</span></p>
-<p id="t374" 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">&nbsp;</span></p>
-<p id="t375" 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">&nbsp;</span></p>
-<p id="t376" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t377" class="stm mis">            <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t378" class="stm mis">            <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t380" 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">&nbsp;</span></p>
-<p id="t381" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t383" class="pln">        <span class="str">""" Process an input file object to an output file object.</span><span class="strut">&nbsp;</span></p>
-<p id="t384" class="pln"><span class="str">            fIn and fOut can be file objects, or file names.</span><span class="strut">&nbsp;</span></p>
-<p id="t385" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t386" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t390" class="pln">        <span class="com"># Convert filenames to files.</span><span class="strut">&nbsp;</span></p>
-<p id="t391" class="stm par run hide_run"><span class="annotate short">391&#x202F;&#x219B;&#x202F;393</span><span class="annotate long">line 391 didn't jump to line 393, because the condition on line 391 was never true</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">&nbsp;</span></p>
-<p id="t392" class="pln">            <span class="com"># Open the input file.</span><span class="strut">&nbsp;</span></p>
-<p id="t393" class="stm mis">            <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut">&nbsp;</span></p>
-<p id="t394" 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">&nbsp;</span></p>
-<p id="t395" class="stm par run hide_run"><span class="annotate short">395&#x202F;&#x219B;&#x202F;397</span><span class="annotate long">line 395 didn't jump to line 397, because the condition on line 395 was never true</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">&nbsp;</span></p>
-<p id="t396" class="pln">            <span class="com"># Open the output file.</span><span class="strut">&nbsp;</span></p>
-<p id="t397" class="stm mis">            <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut">&nbsp;</span></p>
-<p id="t398" 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">&nbsp;</span></p>
-<p id="t399" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t400" class="stm run hide_run">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t402" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t172" class="stm par run hide_run"><span class="annotate short">172&#x202F;&#x219B;&#x202F;173</span><span class="annotate long">line 172 didn't jump to line 173, because the condition on line 172 was never true</span>        <span class="key">if</span> <span class="key">not</span> <span class="nam">PY3</span> <span class="key">and</span> <span class="nam">isinstance</span><span class="op">(</span><span class="nam">sOut</span><span class="op">,</span> <span class="nam">unicode</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t173" class="stm mis">            <span class="nam">sOut</span> <span class="op">=</span> <span class="nam">sOut</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="nam">self</span><span class="op">.</span><span class="nam">sEncoding</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t174" 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">&nbsp;</span></p>
+<p id="t175" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t176" 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">&nbsp;</span></p>
+<p id="t177" class="pln">        <span class="str">""" The cog.outl function.</span><span class="strut">&nbsp;</span></p>
+<p id="t178" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t179" 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">&nbsp;</span></p>
+<p id="t180" 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">&nbsp;</span></p>
+<p id="t181" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t182" 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">&nbsp;</span></p>
+<p id="t183" class="pln">        <span class="str">""" The cog.error function.</span><span class="strut">&nbsp;</span></p>
+<p id="t184" class="pln"><span class="str">            Instead of raising standard python errors, cog generators can use</span><span class="strut">&nbsp;</span></p>
+<p id="t185" class="pln"><span class="str">            this function.  It will display the error without a scary Python</span><span class="strut">&nbsp;</span></p>
+<p id="t186" class="pln"><span class="str">            traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t187" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t188" 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">&nbsp;</span></p>
+<p id="t189" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t190" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t191" class="stm run hide_run"><span class="key">class</span> <span class="nam">NumberedFileReader</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t192" class="pln">    <span class="str">""" A decorator for files that counts the readline()'s called.</span><span class="strut">&nbsp;</span></p>
+<p id="t193" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</span></p>
+<p id="t194" 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">&nbsp;</span></p>
+<p id="t195" 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">&nbsp;</span></p>
+<p id="t196" 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">&nbsp;</span></p>
+<p id="t197" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t198" 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">&nbsp;</span></p>
+<p id="t199" 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">&nbsp;</span></p>
+<p id="t200" class="stm run hide_run">        <span class="key">if</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t201" 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">&nbsp;</span></p>
+<p id="t202" class="stm run hide_run">        <span class="key">return</span> <span class="nam">l</span><span class="strut">&nbsp;</span></p>
+<p id="t203" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t204" 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">&nbsp;</span></p>
+<p id="t205" 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">&nbsp;</span></p>
+<p id="t206" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t207" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t208" class="stm run hide_run"><span class="key">class</span> <span class="nam">CogOptions</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t209" class="pln">    <span class="str">""" Options for a run of cog.</span><span class="strut">&nbsp;</span></p>
+<p id="t210" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</span></p>
+<p id="t211" 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">&nbsp;</span></p>
+<p id="t212" class="pln">        <span class="com"># Defaults for argument values.</span><span class="strut">&nbsp;</span></p>
+<p id="t213" 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">&nbsp;</span></p>
+<p id="t214" 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">&nbsp;</span></p>
+<p id="t215" 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">&nbsp;</span></p>
+<p id="t216" 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">&nbsp;</span></p>
+<p id="t217" 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">&nbsp;</span></p>
+<p id="t218" 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">&nbsp;</span></p>
+<p id="t219" 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">&nbsp;</span></p>
+<p id="t220" 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">&nbsp;</span></p>
+<p id="t221" 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">&nbsp;</span></p>
+<p id="t222" 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">&nbsp;</span></p>
+<p id="t223" 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">&nbsp;</span></p>
+<p id="t224" 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">&nbsp;</span></p>
+<p id="t225" 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">&nbsp;</span></p>
+<p id="t226" 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">&nbsp;</span></p>
+<p id="t227" 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">&nbsp;</span></p>
+<p id="t228" 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">&nbsp;</span></p>
+<p id="t229" 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">&nbsp;</span></p>
+<p id="t230" 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">&nbsp;</span></p>
+<p id="t231" 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">&nbsp;</span></p>
+<p id="t232" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t233" 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">&nbsp;</span></p>
+<p id="t234" class="pln">        <span class="str">""" Comparison operator for tests to use.</span><span class="strut">&nbsp;</span></p>
+<p id="t235" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t236" 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">&nbsp;</span></p>
+<p id="t237" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t238" 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">&nbsp;</span></p>
+<p id="t239" class="pln">        <span class="str">""" Make a clone of these options, for further refinement.</span><span class="strut">&nbsp;</span></p>
+<p id="t240" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t241" 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">&nbsp;</span></p>
+<p id="t242" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t243" 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">&nbsp;</span></p>
+<p id="t244" class="pln">        <span class="str">""" Add directories to the include path.</span><span class="strut">&nbsp;</span></p>
+<p id="t245" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t246" 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">&nbsp;</span></p>
+<p id="t247" 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">&nbsp;</span></p>
+<p id="t248" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t249" 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">&nbsp;</span></p>
+<p id="t250" class="pln">        <span class="com"># Parse the command line arguments.</span><span class="strut">&nbsp;</span></p>
+<p id="t251" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t252" 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">&nbsp;</span></p>
+<p id="t253" class="pln">                <span class="nam">argv</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t254" class="pln">                <span class="str">'cdD:eI:n:o:rs:Uvw:xz'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t255" class="pln">                <span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t256" class="pln">                    <span class="str">'markers='</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t257" class="pln">                    <span class="str">'verbosity='</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t258" class="pln">                <span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t259" class="pln">            <span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t260" 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">&nbsp;</span></p>
+<p id="t261" 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">&nbsp;</span></p>
+<p id="t262" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t263" class="pln">        <span class="com"># Handle the command line arguments.</span><span class="strut">&nbsp;</span></p>
+<p id="t264" 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">&nbsp;</span></p>
+<p id="t265" 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">&nbsp;</span></p>
+<p id="t266" 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">&nbsp;</span></p>
+<p id="t267" 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">&nbsp;</span></p>
+<p id="t268" 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">&nbsp;</span></p>
+<p id="t269" 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">&nbsp;</span></p>
+<p id="t270" 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">&lt;</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t271" 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">&nbsp;</span></p>
+<p id="t272" 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">&nbsp;</span></p>
+<p id="t273" 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">&nbsp;</span></p>
+<p id="t274" 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">&nbsp;</span></p>
+<p id="t275" 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">&nbsp;</span></p>
+<p id="t276" 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">&nbsp;</span></p>
+<p id="t277" 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">&nbsp;</span></p>
+<p id="t278" 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">&nbsp;</span></p>
+<p id="t279" 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">&nbsp;</span></p>
+<p id="t280" 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">&nbsp;</span></p>
+<p id="t281" 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">&nbsp;</span></p>
+<p id="t282" 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">&nbsp;</span></p>
+<p id="t283" 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">&nbsp;</span></p>
+<p id="t284" 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">&nbsp;</span></p>
+<p id="t285" 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">&nbsp;</span></p>
+<p id="t286" 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">&nbsp;</span></p>
+<p id="t287" 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">&nbsp;</span></p>
+<p id="t288" 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">&nbsp;</span></p>
+<p id="t289" 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">&nbsp;</span></p>
+<p id="t290" 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">&nbsp;</span></p>
+<p id="t291" 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">&nbsp;</span></p>
+<p id="t292" 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">&nbsp;</span></p>
+<p id="t293" 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">&nbsp;</span></p>
+<p id="t294" 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">&nbsp;</span></p>
+<p id="t295" 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">&nbsp;</span></p>
+<p id="t296" 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">&nbsp;</span></p>
+<p id="t297" 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">&nbsp;</span></p>
+<p id="t298" 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">&nbsp;</span></p>
+<p id="t299" 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">&nbsp;</span></p>
+<p id="t300" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t301" class="pln">                <span class="com"># Since getopt.getopt is given a list of possible flags,</span><span class="strut">&nbsp;</span></p>
+<p id="t302" class="pln">                <span class="com"># this is an internal error.</span><span class="strut">&nbsp;</span></p>
+<p id="t303" 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">&nbsp;</span></p>
+<p id="t304" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t305" 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">&nbsp;</span></p>
+<p id="t306" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t307" 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">&nbsp;</span></p>
+<p id="t308" class="stm mis">        <span class="key">except</span> <span class="nam">ValueError</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t309" class="stm mis">            <span class="key">raise</span> <span class="nam">CogUsageError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
+<p id="t310" 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">&nbsp;</span></p>
+<p id="t311" class="pln">            <span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t312" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t313" 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">&nbsp;</span></p>
+<p id="t314" class="pln">        <span class="str">""" Does nothing if everything is OK, raises CogError's if it's not.</span><span class="strut">&nbsp;</span></p>
+<p id="t315" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</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">bDeleteCode</span><span class="op">:</span><span class="strut">&nbsp;</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 -d with -r (or you would delete all your source!)"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t318" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t319" 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">&nbsp;</span></p>
+<p id="t320" 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">&nbsp;</span></p>
+<p id="t321" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t322" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t323" 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">&nbsp;</span></p>
+<p id="t324" class="pln">    <span class="str">""" The Cog engine.</span><span class="strut">&nbsp;</span></p>
+<p id="t325" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</span></p>
+<p id="t326" 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">&nbsp;</span></p>
+<p id="t327" 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">&nbsp;</span></p>
+<p id="t328" 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">&nbsp;</span></p>
+<p id="t329" 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">&nbsp;</span></p>
+<p id="t330" 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">&nbsp;</span></p>
+<p id="t331" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t332" 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">&nbsp;</span></p>
+<p id="t333" 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">&nbsp;</span></p>
+<p id="t334" 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&lt;hashsect> *\(checksum: (?P&lt;hash>[a-f0-9]+)\))'</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t335" 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">&nbsp;</span></p>
+<p id="t336" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t337" 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">&nbsp;</span></p>
+<p id="t338" 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">&nbsp;</span></p>
+<p id="t339" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t340" 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">&nbsp;</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">sBeginSpec</span> <span class="key">in</span> <span class="nam">s</span><span class="strut">&nbsp;</span></p>
+<p id="t342" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t343" 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">&nbsp;</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">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">&nbsp;</span></p>
+<p id="t345" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t346" 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">&nbsp;</span></p>
+<p id="t347" 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">&nbsp;</span></p>
+<p id="t348" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t349" 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">&nbsp;</span></p>
+<p id="t350" class="pln">        <span class="str">""" Magic mumbo-jumbo so that imported Python modules</span><span class="strut">&nbsp;</span></p>
+<p id="t351" class="pln"><span class="str">            can say "import cog" and get our state.</span><span class="strut">&nbsp;</span></p>
+<p id="t352" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t353" 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">&nbsp;</span></p>
+<p id="t354" 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">&nbsp;</span></p>
+<p id="t355" 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">&nbsp;</span></p>
+<p id="t356" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t357" 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">&nbsp;</span></p>
+<p id="t358" class="pln">        <span class="str">""" Open an output file, taking all the details into account.</span><span class="strut">&nbsp;</span></p>
+<p id="t359" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t360" class="stm mis">        <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t361" class="stm mis">        <span class="nam">mode</span> <span class="op">=</span> <span class="str">"w"</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t363" 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">&nbsp;</span></p>
+<p id="t364" 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">&nbsp;</span></p>
+<p id="t365" class="stm mis">            <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t366" 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">&nbsp;</span></p>
+<p id="t367" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t368" class="stm mis">                <span class="nam">mode</span> <span class="op">=</span> <span class="str">"wb"</span><span class="strut">&nbsp;</span></p>
+<p id="t369" class="stm mis">        <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">&nbsp;</span></p>
+<p id="t370" class="stm mis">        <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">&nbsp;</span></p>
+<p id="t371" class="stm mis">            <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">&nbsp;</span></p>
+<p id="t372" 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">&nbsp;</span></p>
+<p id="t373" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t374" 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">&nbsp;</span></p>
+<p id="t375" class="pln">        <span class="str">""" Open an input file. """</span><span class="strut">&nbsp;</span></p>
+<p id="t376" 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">&nbsp;</span></p>
+<p id="t377" 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">&nbsp;</span></p>
+<p id="t378" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t379" class="stm mis">            <span class="nam">opts</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t380" class="stm mis">            <span class="key">if</span> <span class="nam">PY3</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t381" 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">&nbsp;</span></p>
+<p id="t382" 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">&nbsp;</span></p>
+<p id="t383" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t384" 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">&nbsp;</span></p>
+<p id="t385" class="pln">        <span class="str">""" Process an input file object to an output file object.</span><span class="strut">&nbsp;</span></p>
+<p id="t386" class="pln"><span class="str">            fIn and fOut can be file objects, or file names.</span><span class="strut">&nbsp;</span></p>
+<p id="t387" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t388" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t389" 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">&nbsp;</span></p>
+<p id="t390" 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">&nbsp;</span></p>
+<p id="t391" 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">&nbsp;</span></p>
+<p id="t392" class="pln">        <span class="com"># Convert filenames to files.</span><span class="strut">&nbsp;</span></p>
+<p id="t393" class="stm par run hide_run"><span class="annotate short">393&#x202F;&#x219B;&#x202F;395</span><span class="annotate long">line 393 didn't jump to line 395, because the condition on line 393 was never true</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">&nbsp;</span></p>
+<p id="t394" class="pln">            <span class="com"># Open the input file.</span><span class="strut">&nbsp;</span></p>
+<p id="t395" class="stm mis">            <span class="nam">sFileIn</span> <span class="op">=</span> <span class="nam">fIn</span><span class="strut">&nbsp;</span></p>
+<p id="t396" 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">&nbsp;</span></p>
+<p id="t397" class="stm par run hide_run"><span class="annotate short">397&#x202F;&#x219B;&#x202F;399</span><span class="annotate long">line 397 didn't jump to line 399, because the condition on line 397 was never true</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">&nbsp;</span></p>
+<p id="t398" class="pln">            <span class="com"># Open the output file.</span><span class="strut">&nbsp;</span></p>
+<p id="t399" class="stm mis">            <span class="nam">sFileOut</span> <span class="op">=</span> <span class="nam">fOut</span><span class="strut">&nbsp;</span></p>
+<p id="t400" 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">&nbsp;</span></p>
+<p id="t401" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t402" class="stm run hide_run">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t403" 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">&nbsp;</span></p>
 <p id="t404" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t407" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t408" class="pln">            <span class="com"># The globals dict we'll use for this file.</span><span class="strut">&nbsp;</span></p>
-<p id="t409" class="stm par run hide_run"><span class="annotate short">409&#x202F;&#x219B;&#x202F;413</span><span class="annotate long">line 409 didn't jump to line 413, because the condition on line 409 was never false</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t411" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t414" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t415" class="pln">            <span class="com"># loop over generator chunks</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t418" class="pln">                <span class="com"># Find the next spec begin</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t420" class="stm par run hide_run"><span class="annotate short">420&#x202F;&#x219B;&#x202F;421</span><span class="annotate long">line 420 didn't jump to line 421, because the condition on line 420 was never true</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">&nbsp;</span></p>
-<p id="t421" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t423" class="stm par run hide_run"><span class="annotate short">423&#x202F;&#x219B;&#x202F;424</span><span class="annotate long">line 423 didn't jump to line 424, because the condition on line 423 was never true</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">&nbsp;</span></p>
-<p id="t424" 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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t429" class="stm run hide_run">                    <span class="key">break</span><span class="strut">&nbsp;</span></p>
-<p id="t430" class="stm par run hide_run"><span class="annotate short">430&#x202F;&#x219B;&#x202F;434</span><span class="annotate long">line 430 didn't jump to line 434, because the condition on line 430 was never false</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t432" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t433" class="pln">                <span class="com"># l is the begin spec</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t439" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t441" class="pln">                <span class="com"># line of code inside.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t448" class="pln">                    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t451" class="pln">                <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t452" class="pln">                    <span class="com"># Deal with an ordinary code block.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t454" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t455" class="pln">                    <span class="com"># Get all the lines in the spec</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t457" class="stm par run hide_run"><span class="annotate short">457&#x202F;&#x219B;&#x202F;458</span><span class="annotate long">line 457 didn't jump to line 458, because the condition on line 457 was never true</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">&nbsp;</span></p>
-<p id="t458" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t460" class="stm par run hide_run"><span class="annotate short">460&#x202F;&#x219B;&#x202F;461</span><span class="annotate long">line 460 didn't jump to line 461, because the condition on line 460 was never true</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">&nbsp;</span></p>
-<p id="t461" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t463" class="stm par run hide_run"><span class="annotate short">463&#x202F;&#x219B;&#x202F;465</span><span class="annotate long">line 463 didn't jump to line 465, because the condition on line 463 was never false</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t467" class="stm par run hide_run"><span class="annotate short">467&#x202F;&#x219B;&#x202F;468</span><span class="annotate long">line 467 didn't jump to line 468, because the condition on line 467 was never true</span>                    <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t468" class="stm mis">                        <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
-<p id="t469" class="pln">                            <span class="str">"Cog block begun but never ended."</span><span class="op">,</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t471" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t472" class="stm par run hide_run"><span class="annotate short">472&#x202F;&#x219B;&#x202F;474</span><span class="annotate long">line 472 didn't jump to line 474, because the condition on line 472 was never false</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t475" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t405" class="stm run hide_run">            <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
+<p id="t406" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t407" 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">&nbsp;</span></p>
+<p id="t408" 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">&nbsp;</span></p>
+<p id="t409" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t410" class="pln">            <span class="com"># The globals dict we'll use for this file.</span><span class="strut">&nbsp;</span></p>
+<p id="t411" class="stm par run hide_run"><span class="annotate short">411&#x202F;&#x219B;&#x202F;415</span><span class="annotate long">line 411 didn't jump to line 415, because the condition on line 411 was never false</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">&nbsp;</span></p>
+<p id="t412" 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">&nbsp;</span></p>
+<p id="t413" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t414" class="pln">            <span class="com"># If there are any global defines, put them in the globals.</span><span class="strut">&nbsp;</span></p>
+<p id="t415" 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">&nbsp;</span></p>
+<p id="t416" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t417" class="pln">            <span class="com"># loop over generator chunks</span><span class="strut">&nbsp;</span></p>
+<p id="t418" 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">&nbsp;</span></p>
+<p id="t419" class="stm run hide_run">            <span class="key">while</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t420" class="pln">                <span class="com"># Find the next spec begin</span><span class="strut">&nbsp;</span></p>
+<p id="t421" 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">&nbsp;</span></p>
+<p id="t422" class="stm par run hide_run"><span class="annotate short">422&#x202F;&#x219B;&#x202F;423</span><span class="annotate long">line 422 didn't jump to line 423, because the condition on line 422 was never true</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">&nbsp;</span></p>
+<p id="t423" 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">&nbsp;</span></p>
+<p id="t424" 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">&nbsp;</span></p>
+<p id="t425" class="stm par run hide_run"><span class="annotate short">425&#x202F;&#x219B;&#x202F;426</span><span class="annotate long">line 425 didn't jump to line 426, because the condition on line 425 was never true</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">&nbsp;</span></p>
+<p id="t426" 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">&nbsp;</span></p>
+<p id="t427" 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">&nbsp;</span></p>
+<p id="t428" 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">&nbsp;</span></p>
+<p id="t429" 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">&nbsp;</span></p>
+<p id="t430" 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">&nbsp;</span></p>
+<p id="t431" class="stm run hide_run">                    <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t432" class="stm par run hide_run"><span class="annotate short">432&#x202F;&#x219B;&#x202F;436</span><span class="annotate long">line 432 didn't jump to line 436, because the condition on line 432 was never false</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">&nbsp;</span></p>
+<p id="t433" 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">&nbsp;</span></p>
+<p id="t434" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t435" class="pln">                <span class="com"># l is the begin spec</span><span class="strut">&nbsp;</span></p>
+<p id="t436" 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">&nbsp;</span></p>
+<p id="t437" 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">&nbsp;</span></p>
+<p id="t438" 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">&nbsp;</span></p>
+<p id="t439" 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">&nbsp;</span></p>
+<p id="t440" 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">&nbsp;</span></p>
+<p id="t441" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t442" class="pln">                <span class="com"># If the spec begin is also a spec end, then process the single</span><span class="strut">&nbsp;</span></p>
+<p id="t443" class="pln">                <span class="com"># line of code inside.</span><span class="strut">&nbsp;</span></p>
+<p id="t444" 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">&nbsp;</span></p>
+<p id="t445" 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">&nbsp;</span></p>
+<p id="t446" 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">&nbsp;</span></p>
+<p id="t447" 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">&nbsp;</span></p>
+<p id="t448" 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">&nbsp;</span></p>
+<p id="t449" 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">&nbsp;</span></p>
+<p id="t450" class="pln">                    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t451" 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">&nbsp;</span></p>
+<p id="t452" 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">&nbsp;</span></p>
+<p id="t453" class="pln">                <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t454" class="pln">                    <span class="com"># Deal with an ordinary code block.</span><span class="strut">&nbsp;</span></p>
+<p id="t455" 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">&nbsp;</span></p>
+<p id="t456" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t457" class="pln">                    <span class="com"># Get all the lines in the spec</span><span class="strut">&nbsp;</span></p>
+<p id="t458" 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">&nbsp;</span></p>
+<p id="t459" class="stm par run hide_run"><span class="annotate short">459&#x202F;&#x219B;&#x202F;460</span><span class="annotate long">line 459 didn't jump to line 460, because the condition on line 459 was never true</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">&nbsp;</span></p>
+<p id="t460" 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">&nbsp;</span></p>
+<p id="t461" 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">&nbsp;</span></p>
+<p id="t462" class="stm par run hide_run"><span class="annotate short">462&#x202F;&#x219B;&#x202F;463</span><span class="annotate long">line 462 didn't jump to line 463, because the condition on line 462 was never true</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">&nbsp;</span></p>
+<p id="t463" 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">&nbsp;</span></p>
+<p id="t464" 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">&nbsp;</span></p>
+<p id="t465" class="stm par run hide_run"><span class="annotate short">465&#x202F;&#x219B;&#x202F;467</span><span class="annotate long">line 465 didn't jump to line 467, because the condition on line 465 was never false</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">&nbsp;</span></p>
+<p id="t466" 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">&nbsp;</span></p>
+<p id="t467" 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">&nbsp;</span></p>
+<p id="t468" 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">&nbsp;</span></p>
+<p id="t469" class="stm par run hide_run"><span class="annotate short">469&#x202F;&#x219B;&#x202F;470</span><span class="annotate long">line 469 didn't jump to line 470, because the condition on line 469 was never true</span>                    <span class="key">if</span> <span class="key">not</span> <span class="nam">l</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t470" class="stm mis">                        <span class="key">raise</span> <span class="nam">CogError</span><span class="op">(</span><span class="strut">&nbsp;</span></p>
+<p id="t471" class="pln">                            <span class="str">"Cog block begun but never ended."</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t472" 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">&nbsp;</span></p>
+<p id="t473" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t474" class="stm par run hide_run"><span class="annotate short">474&#x202F;&#x219B;&#x202F;476</span><span class="annotate long">line 474 didn't jump to line 476, because the condition on line 474 was never false</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">&nbsp;</span></p>
+<p id="t475" 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">&nbsp;</span></p>
+<p id="t476" 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">&nbsp;</span></p>
 <p id="t477" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t479" class="pln">                <span class="com"># them, compute the md5 hash of the old output.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t483" class="stm par run hide_run"><span class="annotate short">483&#x202F;&#x219B;&#x202F;484</span><span class="annotate long">line 483 didn't jump to line 484, because the condition on line 483 was never true</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">&nbsp;</span></p>
-<p id="t484" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t486" class="stm par run hide_run"><span class="annotate short">486&#x202F;&#x219B;&#x202F;487</span><span class="annotate long">line 486 didn't jump to line 487, because the condition on line 486 was never true</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">&nbsp;</span></p>
-<p id="t487" 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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t493" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t494" class="stm par run hide_run"><span class="annotate short">494&#x202F;&#x219B;&#x202F;496</span><span class="annotate long">line 494 didn't jump to line 496, because the condition on line 494 was never true</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t496" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t498" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t499" class="pln">                <span class="com"># Make the previous output available to the current code</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t501" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t503" class="pln">                <span class="com"># supposed to generate code.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t505" class="stm par run hide_run"><span class="annotate short">505&#x202F;&#x219B;&#x202F;511</span><span class="annotate long">line 505 didn't jump to line 511, because the condition on line 505 was never false</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t512" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t478" 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">&nbsp;</span></p>
+<p id="t479" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t480" class="pln">                <span class="com"># Eat all the lines in the output section.  While reading past</span><span class="strut">&nbsp;</span></p>
+<p id="t481" class="pln">                <span class="com"># them, compute the md5 hash of the old output.</span><span class="strut">&nbsp;</span></p>
+<p id="t482" class="stm run hide_run">                <span class="nam">previous</span> <span class="op">=</span> <span class="str">""</span><span class="strut">&nbsp;</span></p>
+<p id="t483" 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">&nbsp;</span></p>
+<p id="t484" 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">&nbsp;</span></p>
+<p id="t485" class="stm par run hide_run"><span class="annotate short">485&#x202F;&#x219B;&#x202F;486</span><span class="annotate long">line 485 didn't jump to line 486, because the condition on line 485 was never true</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">&nbsp;</span></p>
+<p id="t486" 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">&nbsp;</span></p>
+<p id="t487" 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">&nbsp;</span></p>
+<p id="t488" class="stm par run hide_run"><span class="annotate short">488&#x202F;&#x219B;&#x202F;489</span><span class="annotate long">line 488 didn't jump to line 489, because the condition on line 488 was never true</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">&nbsp;</span></p>
+<p id="t489" 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">&nbsp;</span></p>
+<p id="t490" 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">&nbsp;</span></p>
+<p id="t491" class="stm run hide_run">                    <span class="nam">previous</span> <span class="op">+=</span> <span class="nam">l</span><span class="strut">&nbsp;</span></p>
+<p id="t492" 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">&nbsp;</span></p>
+<p id="t493" 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">&nbsp;</span></p>
+<p id="t494" 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">&nbsp;</span></p>
+<p id="t495" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t496" class="stm par run hide_run"><span class="annotate short">496&#x202F;&#x219B;&#x202F;498</span><span class="annotate long">line 496 didn't jump to line 498, because the condition on line 496 was never true</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">&nbsp;</span></p>
+<p id="t497" class="pln">                    <span class="com"># We reached end of file before we found the end output line.</span><span class="strut">&nbsp;</span></p>
+<p id="t498" 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">&nbsp;</span></p>
+<p id="t499" 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">&nbsp;</span></p>
+<p id="t500" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t501" class="pln">                <span class="com"># Make the previous output available to the current code</span><span class="strut">&nbsp;</span></p>
+<p id="t502" 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">&nbsp;</span></p>
+<p id="t503" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t504" class="pln">                <span class="com"># Write the output of the spec to be the new output if we're</span><span class="strut">&nbsp;</span></p>
+<p id="t505" class="pln">                <span class="com"># supposed to generate code.</span><span class="strut">&nbsp;</span></p>
+<p id="t506" 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">&nbsp;</span></p>
+<p id="t507" class="stm par run hide_run"><span class="annotate short">507&#x202F;&#x219B;&#x202F;513</span><span class="annotate long">line 507 didn't jump to line 513, because the condition on line 507 was never false</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">&nbsp;</span></p>
+<p id="t508" 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">&nbsp;</span></p>
+<p id="t509" 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">&nbsp;</span></p>
+<p id="t510" 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">&nbsp;</span></p>
+<p id="t511" 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">&nbsp;</span></p>
+<p id="t512" 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">&nbsp;</span></p>
+<p id="t513" 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">&nbsp;</span></p>
 <p id="t514" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t515" class="pln">                <span class="com"># Write the ending output line</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t517" class="stm par run hide_run"><span class="annotate short">517&#x202F;&#x219B;&#x202F;518</span><span class="annotate long">line 517 didn't jump to line 518, because the condition on line 517 was never true</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">&nbsp;</span></p>
-<p id="t518" class="stm mis">                    <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t519" 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">&nbsp;</span></p>
-<p id="t520" 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">&nbsp;</span></p>
-<p id="t521" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t523" class="pln">                        <span class="com"># Create a new end line with the correct hash.</span><span class="strut">&nbsp;</span></p>
-<p id="t524" 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">&nbsp;</span></p>
-<p id="t525" class="pln">                    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t527" 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">&nbsp;</span></p>
-<p id="t528" 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">&nbsp;</span></p>
-<p id="t529" class="pln">                <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t531" class="pln">                    <span class="com"># it.</span><span class="strut">&nbsp;</span></p>
-<p id="t532" class="stm par run hide_run"><span class="annotate short">532&#x202F;&#x219B;&#x202F;533</span><span class="annotate long">line 532 didn't jump to line 533, because the condition on line 532 was never true</span>                    <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t533" 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">&nbsp;</span></p>
-<p id="t534" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t535" class="stm par run hide_run"><span class="annotate short">535&#x202F;&#x219B;&#x202F;537</span><span class="annotate long">line 535 didn't jump to line 537, because the condition on line 535 was never false</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t538" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t539" class="stm par run hide_run"><span class="annotate short">539&#x202F;&#x219B;&#x202F;540</span><span class="annotate long">line 539 didn't jump to line 540, because the condition on line 539 was never true</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">&nbsp;</span></p>
-<p id="t540" 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">&nbsp;</span></p>
-<p id="t541" class="pln">        <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t542" class="stm par run hide_run"><span class="annotate short">542&#x202F;&#x219B;&#x202F;543</span><span class="annotate long">line 542 didn't jump to line 543, because the condition on line 542 was never true</span>            <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t543" 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">&nbsp;</span></p>
-<p id="t544" class="stm par run hide_run"><span class="annotate short">544&#x202F;&#x219B;&#x202F;545</span><span class="annotate long">line 544 didn't jump to line 545, because the condition on line 544 was never true</span>            <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t545" 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">&nbsp;</span></p>
-<p id="t546" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t547" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t548" class="pln">    <span class="com"># A regex for non-empty lines, used by suffixLines.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t550" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t553" class="pln"><span class="str">            text is many lines, as a single string.</span><span class="strut">&nbsp;</span></p>
-<p id="t554" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t555" class="stm par run hide_run"><span class="annotate short">555&#x202F;&#x219B;&#x202F;557</span><span class="annotate long">line 555 didn't jump to line 557, because the condition on line 555 was never true</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t557" class="stm mis">            <span class="nam">repl</span> <span class="op">=</span> <span class="str">r"\g&lt;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">&nbsp;</span></p>
-<p id="t558" 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">&nbsp;</span></p>
-<p id="t559" class="stm run hide_run">        <span class="key">return</span> <span class="nam">text</span><span class="strut">&nbsp;</span></p>
-<p id="t560" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t562" class="pln">        <span class="str">""" Process sInput as the text to cog.</span><span class="strut">&nbsp;</span></p>
-<p id="t563" class="pln"><span class="str">            Return the cogged output as a string.</span><span class="strut">&nbsp;</span></p>
-<p id="t564" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t569" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t571" class="pln">        <span class="str">""" Replace file sOldPath with the contents sNewText</span><span class="strut">&nbsp;</span></p>
-<p id="t572" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t573" 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">&nbsp;</span></p>
-<p id="t574" class="pln">            <span class="com"># Need to ensure we can write.</span><span class="strut">&nbsp;</span></p>
-<p id="t575" 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">&nbsp;</span></p>
-<p id="t576" class="pln">                <span class="com"># Use an external command to make the file writable.</span><span class="strut">&nbsp;</span></p>
-<p id="t577" 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">&nbsp;</span></p>
-<p id="t578" 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">&nbsp;</span></p>
-<p id="t579" 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">&nbsp;</span></p>
-<p id="t580" 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">&nbsp;</span></p>
-<p id="t581" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t582" class="pln">                <span class="com"># Can't write!</span><span class="strut">&nbsp;</span></p>
-<p id="t583" 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">&nbsp;</span></p>
-<p id="t584" 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">&nbsp;</span></p>
-<p id="t585" 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">&nbsp;</span></p>
-<p id="t586" 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">&nbsp;</span></p>
-<p id="t587" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t589" 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">&nbsp;</span></p>
-<p id="t590" 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">&nbsp;</span></p>
-<p id="t591" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t593" 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">&nbsp;</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">self</span><span class="op">.</span><span class="nam">options</span><span class="op">.</span><span class="nam">includePath</span><span class="strut">&nbsp;</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">self</span><span class="op">.</span><span class="nam">savedSysPath</span><span class="strut">&nbsp;</span></p>
-<p id="t596" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t598" 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">&nbsp;</span></p>
-<p id="t599" 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">&nbsp;</span></p>
-<p id="t600" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t602" class="pln">        <span class="str">""" Process one filename through cog.</span><span class="strut">&nbsp;</span></p>
-<p id="t603" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t604" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t605" 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">&nbsp;</span></p>
-<p id="t606" class="stm mis">        <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
-<p id="t607" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t608" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t609" 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">&nbsp;</span></p>
-<p id="t610" class="pln">            <span class="com"># Since we know where the input file came from,</span><span class="strut">&nbsp;</span></p>
-<p id="t611" class="pln">            <span class="com"># push its directory onto the include path.</span><span class="strut">&nbsp;</span></p>
-<p id="t612" 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">&nbsp;</span></p>
-<p id="t613" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t615" 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">&nbsp;</span></p>
-<p id="t616" 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">&nbsp;</span></p>
-<p id="t617" 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">&nbsp;</span></p>
-<p id="t618" class="pln">                <span class="com"># We want to replace the cog file with the output,</span><span class="strut">&nbsp;</span></p>
-<p id="t619" class="pln">                <span class="com"># but only if they differ.</span><span class="strut">&nbsp;</span></p>
-<p id="t620" 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">&nbsp;</span></p>
-<p id="t621" 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">&nbsp;</span></p>
-<p id="t622" class="stm mis">                    <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
-<p id="t623" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t624" class="stm mis">                <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t625" 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">&nbsp;</span></p>
-<p id="t626" 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">&nbsp;</span></p>
-<p id="t627" 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">&nbsp;</span></p>
-<p id="t628" 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">&nbsp;</span></p>
-<p id="t629" 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">&nbsp;</span></p>
-<p id="t630" 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">&nbsp;</span></p>
-<p id="t631" 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">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t632" 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">&nbsp;</span></p>
-<p id="t633" 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">&nbsp;</span></p>
-<p id="t634" class="stm mis">                            <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
-<p id="t635" 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">&nbsp;</span></p>
-<p id="t636" class="pln">                <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t640" class="pln">                    <span class="com"># any traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t641" class="stm mis">                    <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t642" 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">&nbsp;</span></p>
-<p id="t643" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t644" 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">&nbsp;</span></p>
-<p id="t645" class="pln">        <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t646" 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">&nbsp;</span></p>
-<p id="t647" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t649" class="pln">        <span class="str">""" Process the files in a file list.</span><span class="strut">&nbsp;</span></p>
-<p id="t650" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t651" 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">&nbsp;</span></p>
-<p id="t652" 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">&nbsp;</span></p>
-<p id="t653" 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">&nbsp;</span></p>
-<p id="t654" 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">&nbsp;</span></p>
-<p id="t655" class="pln">            <span class="com"># Use shlex to parse the line like a shell.</span><span class="strut">&nbsp;</span></p>
-<p id="t656" 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">&nbsp;</span></p>
-<p id="t657" 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">&nbsp;</span></p>
-<p id="t658" 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">&nbsp;</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">&nbsp;</span></p>
-<p id="t660" 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">&nbsp;</span></p>
-<p id="t661" 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">&nbsp;</span></p>
-<p id="t662" class="stm mis">            <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t663" 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">&nbsp;</span></p>
-<p id="t664" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t666" class="pln">        <span class="str">""" Process one command-line.</span><span class="strut">&nbsp;</span></p>
-<p id="t667" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t668" 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">&nbsp;</span></p>
-<p id="t669" 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">&nbsp;</span></p>
-<p id="t670" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t671" 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">&nbsp;</span></p>
-<p id="t672" 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">&nbsp;</span></p>
-<p id="t673" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t674" 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">&nbsp;</span></p>
-<p id="t675" 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">&nbsp;</span></p>
-<p id="t676" 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">&nbsp;</span></p>
-<p id="t677" 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">&nbsp;</span></p>
-<p id="t678" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t679" 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">&nbsp;</span></p>
-<p id="t680" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t681" 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">&nbsp;</span></p>
+<p id="t515" class="stm run hide_run">                <span class="nam">bSawCog</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t516" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t517" class="pln">                <span class="com"># Write the ending output line</span><span class="strut">&nbsp;</span></p>
+<p id="t518" 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">&nbsp;</span></p>
+<p id="t519" class="stm par run hide_run"><span class="annotate short">519&#x202F;&#x219B;&#x202F;520</span><span class="annotate long">line 519 didn't jump to line 520, because the condition on line 519 was never true</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">&nbsp;</span></p>
+<p id="t520" class="stm mis">                    <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t521" 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">&nbsp;</span></p>
+<p id="t522" 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">&nbsp;</span></p>
+<p id="t523" 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">&nbsp;</span></p>
+<p id="t524" 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">&nbsp;</span></p>
+<p id="t525" class="pln">                        <span class="com"># Create a new end line with the correct hash.</span><span class="strut">&nbsp;</span></p>
+<p id="t526" 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">&nbsp;</span></p>
+<p id="t527" class="pln">                    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t528" class="pln">                        <span class="com"># There was no old hash, but we want a new hash.</span><span class="strut">&nbsp;</span></p>
+<p id="t529" 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">&nbsp;</span></p>
+<p id="t530" 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">&nbsp;</span></p>
+<p id="t531" class="pln">                <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t532" class="pln">                    <span class="com"># We don't want hashes output, so if there was one, get rid of</span><span class="strut">&nbsp;</span></p>
+<p id="t533" class="pln">                    <span class="com"># it.</span><span class="strut">&nbsp;</span></p>
+<p id="t534" class="stm par run hide_run"><span class="annotate short">534&#x202F;&#x219B;&#x202F;535</span><span class="annotate long">line 534 didn't jump to line 535, because the condition on line 534 was never true</span>                    <span class="key">if</span> <span class="nam">hashMatch</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t535" 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">&nbsp;</span></p>
+<p id="t536" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t537" class="stm par run hide_run"><span class="annotate short">537&#x202F;&#x219B;&#x202F;539</span><span class="annotate long">line 537 didn't jump to line 539, because the condition on line 537 was never false</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">&nbsp;</span></p>
+<p id="t538" 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">&nbsp;</span></p>
+<p id="t539" 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">&nbsp;</span></p>
+<p id="t540" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t541" class="stm par run hide_run"><span class="annotate short">541&#x202F;&#x219B;&#x202F;542</span><span class="annotate long">line 541 didn't jump to line 542, because the condition on line 541 was never true</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">&nbsp;</span></p>
+<p id="t542" 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">&nbsp;</span></p>
+<p id="t543" class="pln">        <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t544" class="stm par run hide_run"><span class="annotate short">544&#x202F;&#x219B;&#x202F;545</span><span class="annotate long">line 544 didn't jump to line 545, because the condition on line 544 was never true</span>            <span class="key">if</span> <span class="nam">fInToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t545" 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">&nbsp;</span></p>
+<p id="t546" class="stm par run hide_run"><span class="annotate short">546&#x202F;&#x219B;&#x202F;547</span><span class="annotate long">line 546 didn't jump to line 547, because the condition on line 546 was never true</span>            <span class="key">if</span> <span class="nam">fOutToClose</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t547" 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">&nbsp;</span></p>
+<p id="t548" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t549" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t550" class="pln">    <span class="com"># A regex for non-empty lines, used by suffixLines.</span><span class="strut">&nbsp;</span></p>
+<p id="t551" 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">&nbsp;</span></p>
+<p id="t552" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t553" 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">&nbsp;</span></p>
+<p id="t554" class="pln">        <span class="str">""" Add suffixes to the lines in text, if our options desire it.</span><span class="strut">&nbsp;</span></p>
+<p id="t555" class="pln"><span class="str">            text is many lines, as a single string.</span><span class="strut">&nbsp;</span></p>
+<p id="t556" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t557" class="stm par run hide_run"><span class="annotate short">557&#x202F;&#x219B;&#x202F;559</span><span class="annotate long">line 557 didn't jump to line 559, because the condition on line 557 was never true</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">&nbsp;</span></p>
+<p id="t558" class="pln">            <span class="com"># Find all non-blank lines, and add the suffix to the end.</span><span class="strut">&nbsp;</span></p>
+<p id="t559" class="stm mis">            <span class="nam">repl</span> <span class="op">=</span> <span class="str">r"\g&lt;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">&nbsp;</span></p>
+<p id="t560" 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">&nbsp;</span></p>
+<p id="t561" class="stm run hide_run">        <span class="key">return</span> <span class="nam">text</span><span class="strut">&nbsp;</span></p>
+<p id="t562" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t563" 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">&nbsp;</span></p>
+<p id="t564" class="pln">        <span class="str">""" Process sInput as the text to cog.</span><span class="strut">&nbsp;</span></p>
+<p id="t565" class="pln"><span class="str">            Return the cogged output as a string.</span><span class="strut">&nbsp;</span></p>
+<p id="t566" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t567" 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">&nbsp;</span></p>
+<p id="t568" 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">&nbsp;</span></p>
+<p id="t569" 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">&nbsp;</span></p>
+<p id="t570" 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">&nbsp;</span></p>
+<p id="t571" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t572" 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">&nbsp;</span></p>
+<p id="t573" class="pln">        <span class="str">""" Replace file sOldPath with the contents sNewText</span><span class="strut">&nbsp;</span></p>
+<p id="t574" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t576" class="pln">            <span class="com"># Need to ensure we can write.</span><span class="strut">&nbsp;</span></p>
+<p id="t577" 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">&nbsp;</span></p>
+<p id="t578" class="pln">                <span class="com"># Use an external command to make the file writable.</span><span class="strut">&nbsp;</span></p>
+<p id="t579" 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">&nbsp;</span></p>
+<p id="t580" 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">&nbsp;</span></p>
+<p id="t581" 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">&nbsp;</span></p>
+<p id="t582" 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">&nbsp;</span></p>
+<p id="t583" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t584" class="pln">                <span class="com"># Can't write!</span><span class="strut">&nbsp;</span></p>
+<p id="t585" 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">&nbsp;</span></p>
+<p id="t586" 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">&nbsp;</span></p>
+<p id="t587" 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">&nbsp;</span></p>
+<p id="t588" 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">&nbsp;</span></p>
+<p id="t589" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t590" 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">&nbsp;</span></p>
+<p id="t591" 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">&nbsp;</span></p>
+<p id="t592" 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">&nbsp;</span></p>
+<p id="t593" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t594" 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">&nbsp;</span></p>
+<p id="t595" 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">&nbsp;</span></p>
+<p id="t596" 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">&nbsp;</span></p>
+<p id="t597" 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">&nbsp;</span></p>
+<p id="t598" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t599" 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">&nbsp;</span></p>
+<p id="t600" 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">&nbsp;</span></p>
+<p id="t601" 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">&nbsp;</span></p>
+<p id="t602" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t603" 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">&nbsp;</span></p>
+<p id="t604" class="pln">        <span class="str">""" Process one filename through cog.</span><span class="strut">&nbsp;</span></p>
+<p id="t605" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t606" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t607" 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">&nbsp;</span></p>
+<p id="t608" class="stm mis">        <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
+<p id="t609" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t610" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t611" 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">&nbsp;</span></p>
+<p id="t612" class="pln">            <span class="com"># Since we know where the input file came from,</span><span class="strut">&nbsp;</span></p>
+<p id="t613" class="pln">            <span class="com"># push its directory onto the include path.</span><span class="strut">&nbsp;</span></p>
+<p id="t614" 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">&nbsp;</span></p>
+<p id="t615" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t616" class="pln">            <span class="com"># How we process the file depends on where the output is going.</span><span class="strut">&nbsp;</span></p>
+<p id="t617" 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">&nbsp;</span></p>
+<p id="t618" 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">&nbsp;</span></p>
+<p id="t619" 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">&nbsp;</span></p>
+<p id="t620" class="pln">                <span class="com"># We want to replace the cog file with the output,</span><span class="strut">&nbsp;</span></p>
+<p id="t621" class="pln">                <span class="com"># but only if they differ.</span><span class="strut">&nbsp;</span></p>
+<p id="t622" 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">&nbsp;</span></p>
+<p id="t623" 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">&nbsp;</span></p>
+<p id="t624" class="stm mis">                    <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">True</span><span class="strut">&nbsp;</span></p>
+<p id="t625" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t626" class="stm mis">                <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t627" 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">&nbsp;</span></p>
+<p id="t628" 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">&nbsp;</span></p>
+<p id="t629" 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">&nbsp;</span></p>
+<p id="t630" 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">&nbsp;</span></p>
+<p id="t631" 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">&nbsp;</span></p>
+<p id="t632" 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">&nbsp;</span></p>
+<p id="t633" 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">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t634" 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">&nbsp;</span></p>
+<p id="t635" 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">&nbsp;</span></p>
+<p id="t636" class="stm mis">                            <span class="nam">bNeedNewline</span> <span class="op">=</span> <span class="nam">False</span><span class="strut">&nbsp;</span></p>
+<p id="t637" 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">&nbsp;</span></p>
+<p id="t638" class="pln">                <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t639" class="pln">                    <span class="com"># The try-finally block is so we can print a partial line</span><span class="strut">&nbsp;</span></p>
+<p id="t640" class="pln">                    <span class="com"># with the name of the file, and print (changed) on the</span><span class="strut">&nbsp;</span></p>
+<p id="t641" class="pln">                    <span class="com"># same line, but also make sure to break the line before</span><span class="strut">&nbsp;</span></p>
+<p id="t642" class="pln">                    <span class="com"># any traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t643" class="stm mis">                    <span class="key">if</span> <span class="nam">bNeedNewline</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t644" 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">&nbsp;</span></p>
+<p id="t645" class="pln">            <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t646" 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">&nbsp;</span></p>
+<p id="t647" class="pln">        <span class="key">finally</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t648" 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">&nbsp;</span></p>
+<p id="t649" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t650" 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">&nbsp;</span></p>
+<p id="t651" class="pln">        <span class="str">""" Process the files in a file list.</span><span class="strut">&nbsp;</span></p>
+<p id="t652" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t653" 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">&nbsp;</span></p>
+<p id="t654" 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">&nbsp;</span></p>
+<p id="t655" 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">&nbsp;</span></p>
+<p id="t656" 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">&nbsp;</span></p>
+<p id="t657" class="pln">            <span class="com"># Use shlex to parse the line like a shell.</span><span class="strut">&nbsp;</span></p>
+<p id="t658" 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">&nbsp;</span></p>
+<p id="t659" 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">&nbsp;</span></p>
+<p id="t660" 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">&nbsp;</span></p>
+<p id="t661" class="pln">            <span class="com"># No escapes, so that backslash can be part of the path</span><span class="strut">&nbsp;</span></p>
+<p id="t662" 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">&nbsp;</span></p>
+<p id="t663" 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">&nbsp;</span></p>
+<p id="t664" class="stm mis">            <span class="key">if</span> <span class="nam">args</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t665" 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">&nbsp;</span></p>
+<p id="t666" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t667" 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">&nbsp;</span></p>
+<p id="t668" class="pln">        <span class="str">""" Process one command-line.</span><span class="strut">&nbsp;</span></p>
+<p id="t669" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t670" 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">&nbsp;</span></p>
+<p id="t671" 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">&nbsp;</span></p>
+<p id="t672" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t673" 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">&nbsp;</span></p>
+<p id="t674" 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">&nbsp;</span></p>
+<p id="t675" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t676" 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">&nbsp;</span></p>
+<p id="t677" 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">&nbsp;</span></p>
+<p id="t678" 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">&nbsp;</span></p>
+<p id="t679" 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">&nbsp;</span></p>
+<p id="t680" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t681" 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">&nbsp;</span></p>
 <p id="t682" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t684" class="pln">        <span class="str">""" All of command-line cog, but in a callable form.</span><span class="strut">&nbsp;</span></p>
-<p id="t685" class="pln"><span class="str">            This is used by main.</span><span class="strut">&nbsp;</span></p>
-<p id="t686" class="pln"><span class="str">            argv is the equivalent of sys.argv.</span><span class="strut">&nbsp;</span></p>
-<p id="t687" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t688" 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">&nbsp;</span></p>
-<p id="t689" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t690" class="pln">        <span class="com"># Provide help if asked for anywhere in the command line.</span><span class="strut">&nbsp;</span></p>
-<p id="t691" 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">&nbsp;</span></p>
-<p id="t692" 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">&nbsp;</span></p>
-<p id="t693" class="stm mis">            <span class="key">return</span><span class="strut">&nbsp;</span></p>
-<p id="t694" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t695" 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">&nbsp;</span></p>
-<p id="t696" 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">&nbsp;</span></p>
-<p id="t697" 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">&nbsp;</span></p>
-<p id="t698" class="pln"><span class="strut">&nbsp;</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">bShowVersion</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t700" 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">&nbsp;</span></p>
-<p id="t701" class="stm mis">            <span class="key">return</span><span class="strut">&nbsp;</span></p>
-<p id="t702" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t703" 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">&nbsp;</span></p>
-<p id="t704" 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">&nbsp;</span></p>
-<p id="t705" 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">&nbsp;</span></p>
-<p id="t706" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t707" 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">&nbsp;</span></p>
-<p id="t708" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t710" class="pln">        <span class="str">""" Handle the command-line execution for cog.</span><span class="strut">&nbsp;</span></p>
-<p id="t711" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
-<p id="t712" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t713" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t714" 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">&nbsp;</span></p>
-<p id="t715" class="stm mis">            <span class="key">return</span> <span class="num">0</span><span class="strut">&nbsp;</span></p>
-<p id="t716" 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">&nbsp;</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="nam">err</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t718" 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">&nbsp;</span></p>
-<p id="t719" class="stm mis">            <span class="key">return</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
-<p id="t720" 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">&nbsp;</span></p>
-<p id="t721" 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">&nbsp;</span></p>
-<p id="t722" class="stm mis">            <span class="key">return</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t723" 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">&nbsp;</span></p>
-<p id="t724" 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">&nbsp;</span></p>
-<p id="t725" class="stm mis">            <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t726" class="stm mis">        <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t727" 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">&nbsp;</span></p>
-<p id="t728" class="stm mis">            <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t729" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t730" class="pln"><span class="com"># History:</span><span class="strut">&nbsp;</span></p>
-<p id="t731" class="pln"><span class="com"># 20040210: First public version.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t733" class="pln"><span class="com">#           -v option on the command line shows the version.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t735" class="pln"><span class="com"># 20040605: Fixed some blank line handling in cog.</span><span class="strut">&nbsp;</span></p>
-<p id="t736" class="pln"><span class="com">#           Fixed problems with assigning to xml elements in handyxml.</span><span class="strut">&nbsp;</span></p>
-<p id="t737" class="pln"><span class="com"># 20040621: Changed all line-ends to LF from CRLF.</span><span class="strut">&nbsp;</span></p>
-<p id="t738" class="pln"><span class="com"># 20041002: Refactor some option handling to simplify unittesting the options.</span><span class="strut">&nbsp;</span></p>
-<p id="t739" class="pln"><span class="com"># 20041118: cog.out and cog.outl have optional string arguments.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t744" class="pln"><span class="com">#           the same line.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t746" class="pln"><span class="com">#           file so they can share state.</span><span class="strut">&nbsp;</span></p>
-<p id="t747" class="pln"><span class="com"># 20050206: Added the -x switch to remove all generated output.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t750" class="pln"><span class="com">#           detected before they are obliterated.</span><span class="strut">&nbsp;</span></p>
-<p id="t751" class="pln"><span class="com"># 20050521: Added cog.error, contributed by Alexander Belchenko.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t753" class="pln"><span class="com"># 20050724: Many tweaks to improve code coverage.</span><span class="strut">&nbsp;</span></p>
-<p id="t754" class="pln"><span class="com"># 20050726: Error messages are now printed with no traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t755" class="pln"><span class="com">#           Code can no longer appear on the marker lines,</span><span class="strut">&nbsp;</span></p>
-<p id="t756" class="pln"><span class="com">#               except for single-line style.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t758" class="pln"><span class="com">#               at the end of the file.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t760" class="pln"><span class="com">#               future features.</span><span class="strut">&nbsp;</span></p>
-<p id="t761" class="pln"><span class="com"># 20050805: The cogmodule.path wasn't being properly maintained.</span><span class="strut">&nbsp;</span></p>
-<p id="t762" class="pln"><span class="com"># 20050808: Added the -D option to define a global value.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t766" class="pln"><span class="com">#               behavior for that line.</span><span class="strut">&nbsp;</span></p>
-<p id="t767" class="pln"><span class="com"># 20051006: Version 2.0</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t769" class="pln"><span class="com">#               Alexander Belchenko.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t771" class="pln"><span class="com">#               the args after each line of an @file.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t773" class="pln"><span class="com">#           Use the builtin compile() instead of compiler, for Jython.</span><span class="strut">&nbsp;</span></p>
-<p id="t774" class="pln"><span class="com">#           Explicitly close files we opened, Jython likes this.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t776" class="pln"><span class="com"># 20150104: --markers option added by Doug Hellmann.</span><span class="strut">&nbsp;</span></p>
-<p id="t777" class="pln"><span class="com"># 20150104: -n ENCODING option added by Petr Gladkiy.</span><span class="strut">&nbsp;</span></p>
-<p id="t778" class="pln"><span class="com"># 20150107: Added --verbose to control what files get listed.</span><span class="strut">&nbsp;</span></p>
-<p id="t779" class="pln"><span class="com"># 20150111: Version 2.4</span><span class="strut">&nbsp;</span></p>
-<p id="t780" class="pln"><span class="com"># 20160213: v2.5: -o makes needed directories, thanks Jean-Fran&#231;ois Giraud.</span><span class="strut">&nbsp;</span></p>
-<p id="t781" class="pln"><span class="com"># 20161019: Added a LICENSE.txt file.</span><span class="strut">&nbsp;</span></p>
+<p id="t683" 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">&nbsp;</span></p>
+<p id="t684" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t685" 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">&nbsp;</span></p>
+<p id="t686" class="pln">        <span class="str">""" All of command-line cog, but in a callable form.</span><span class="strut">&nbsp;</span></p>
+<p id="t687" class="pln"><span class="str">            This is used by main.</span><span class="strut">&nbsp;</span></p>
+<p id="t688" class="pln"><span class="str">            argv is the equivalent of sys.argv.</span><span class="strut">&nbsp;</span></p>
+<p id="t689" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t690" 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">&nbsp;</span></p>
+<p id="t691" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t692" class="pln">        <span class="com"># Provide help if asked for anywhere in the command line.</span><span class="strut">&nbsp;</span></p>
+<p id="t693" 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">&nbsp;</span></p>
+<p id="t694" 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">&nbsp;</span></p>
+<p id="t695" class="stm mis">            <span class="key">return</span><span class="strut">&nbsp;</span></p>
+<p id="t696" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t697" 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">&nbsp;</span></p>
+<p id="t698" 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">&nbsp;</span></p>
+<p id="t699" 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">&nbsp;</span></p>
+<p id="t700" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t701" 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">&nbsp;</span></p>
+<p id="t702" 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">&nbsp;</span></p>
+<p id="t703" class="stm mis">            <span class="key">return</span><span class="strut">&nbsp;</span></p>
+<p id="t704" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t705" 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">&nbsp;</span></p>
+<p id="t706" 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">&nbsp;</span></p>
+<p id="t707" 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">&nbsp;</span></p>
+<p id="t708" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t709" 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">&nbsp;</span></p>
+<p id="t710" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t711" 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">&nbsp;</span></p>
+<p id="t712" class="pln">        <span class="str">""" Handle the command-line execution for cog.</span><span class="strut">&nbsp;</span></p>
+<p id="t713" class="pln"><span class="str">        """</span><span class="strut">&nbsp;</span></p>
+<p id="t714" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t715" class="stm mis">        <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t716" 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">&nbsp;</span></p>
+<p id="t717" class="stm mis">            <span class="key">return</span> <span class="num">0</span><span class="strut">&nbsp;</span></p>
+<p id="t718" 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">&nbsp;</span></p>
+<p id="t719" 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">&nbsp;</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="str">"(for help use -?)"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t721" class="stm mis">            <span class="key">return</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t722" 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">&nbsp;</span></p>
+<p id="t723" 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">&nbsp;</span></p>
+<p id="t724" class="stm mis">            <span class="key">return</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t725" 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">&nbsp;</span></p>
+<p id="t726" 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">&nbsp;</span></p>
+<p id="t727" class="stm mis">            <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t728" class="stm mis">        <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t729" 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">&nbsp;</span></p>
+<p id="t730" class="stm mis">            <span class="key">return</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t731" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t732" class="pln"><span class="com"># History:</span><span class="strut">&nbsp;</span></p>
+<p id="t733" class="pln"><span class="com"># 20040210: First public version.</span><span class="strut">&nbsp;</span></p>
+<p id="t734" class="pln"><span class="com"># 20040220: Text preceding the start and end marker are removed from Python lines.</span><span class="strut">&nbsp;</span></p>
+<p id="t735" class="pln"><span class="com">#           -v option on the command line shows the version.</span><span class="strut">&nbsp;</span></p>
+<p id="t736" class="pln"><span class="com"># 20040311: Make sure the last line of output is properly ended with a newline.</span><span class="strut">&nbsp;</span></p>
+<p id="t737" class="pln"><span class="com"># 20040605: Fixed some blank line handling in cog.</span><span class="strut">&nbsp;</span></p>
+<p id="t738" class="pln"><span class="com">#           Fixed problems with assigning to xml elements in handyxml.</span><span class="strut">&nbsp;</span></p>
+<p id="t739" class="pln"><span class="com"># 20040621: Changed all line-ends to LF from CRLF.</span><span class="strut">&nbsp;</span></p>
+<p id="t740" class="pln"><span class="com"># 20041002: Refactor some option handling to simplify unittesting the options.</span><span class="strut">&nbsp;</span></p>
+<p id="t741" class="pln"><span class="com"># 20041118: cog.out and cog.outl have optional string arguments.</span><span class="strut">&nbsp;</span></p>
+<p id="t742" class="pln"><span class="com"># 20041119: File names weren't being properly passed around for warnings, etc.</span><span class="strut">&nbsp;</span></p>
+<p id="t743" class="pln"><span class="com"># 20041122: Added cog.firstLineNum: a property with the line number of the [[[cog line.</span><span class="strut">&nbsp;</span></p>
+<p id="t744" class="pln"><span class="com">#           Added cog.inFile and cog.outFile: the names of the input and output file.</span><span class="strut">&nbsp;</span></p>
+<p id="t745" class="pln"><span class="com"># 20041218: Single-line cog generators, with start marker and end marker on</span><span class="strut">&nbsp;</span></p>
+<p id="t746" class="pln"><span class="com">#           the same line.</span><span class="strut">&nbsp;</span></p>
+<p id="t747" class="pln"><span class="com"># 20041230: Keep a single globals dict for all the code fragments in a single</span><span class="strut">&nbsp;</span></p>
+<p id="t748" class="pln"><span class="com">#           file so they can share state.</span><span class="strut">&nbsp;</span></p>
+<p id="t749" class="pln"><span class="com"># 20050206: Added the -x switch to remove all generated output.</span><span class="strut">&nbsp;</span></p>
+<p id="t750" class="pln"><span class="com"># 20050218: Now code can be on the marker lines as well.</span><span class="strut">&nbsp;</span></p>
+<p id="t751" class="pln"><span class="com"># 20050219: Added -c switch to checksum the output so that edits can be</span><span class="strut">&nbsp;</span></p>
+<p id="t752" class="pln"><span class="com">#           detected before they are obliterated.</span><span class="strut">&nbsp;</span></p>
+<p id="t753" class="pln"><span class="com"># 20050521: Added cog.error, contributed by Alexander Belchenko.</span><span class="strut">&nbsp;</span></p>
+<p id="t754" class="pln"><span class="com"># 20050720: Added code deletion and settable globals contributed by Blake Winton.</span><span class="strut">&nbsp;</span></p>
+<p id="t755" class="pln"><span class="com"># 20050724: Many tweaks to improve code coverage.</span><span class="strut">&nbsp;</span></p>
+<p id="t756" class="pln"><span class="com"># 20050726: Error messages are now printed with no traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t757" class="pln"><span class="com">#           Code can no longer appear on the marker lines,</span><span class="strut">&nbsp;</span></p>
+<p id="t758" class="pln"><span class="com">#               except for single-line style.</span><span class="strut">&nbsp;</span></p>
+<p id="t759" class="pln"><span class="com">#           -z allows omission of the [[[end]]] marker, and it will be assumed</span><span class="strut">&nbsp;</span></p>
+<p id="t760" class="pln"><span class="com">#               at the end of the file.</span><span class="strut">&nbsp;</span></p>
+<p id="t761" class="pln"><span class="com"># 20050729: Refactor option parsing into a separate class, in preparation for</span><span class="strut">&nbsp;</span></p>
+<p id="t762" class="pln"><span class="com">#               future features.</span><span class="strut">&nbsp;</span></p>
+<p id="t763" class="pln"><span class="com"># 20050805: The cogmodule.path wasn't being properly maintained.</span><span class="strut">&nbsp;</span></p>
+<p id="t764" class="pln"><span class="com"># 20050808: Added the -D option to define a global value.</span><span class="strut">&nbsp;</span></p>
+<p id="t765" class="pln"><span class="com"># 20050810: The %s in the -w command is dealt with more robustly.</span><span class="strut">&nbsp;</span></p>
+<p id="t766" class="pln"><span class="com">#           Added the -s option to suffix output lines with a marker.</span><span class="strut">&nbsp;</span></p>
+<p id="t767" class="pln"><span class="com"># 20050817: Now @files can have arguments on each line to change the cog's</span><span class="strut">&nbsp;</span></p>
+<p id="t768" class="pln"><span class="com">#               behavior for that line.</span><span class="strut">&nbsp;</span></p>
+<p id="t769" class="pln"><span class="com"># 20051006: Version 2.0</span><span class="strut">&nbsp;</span></p>
+<p id="t770" class="pln"><span class="com"># 20080521: -U options lets you create Unix newlines on Windows.  Thanks,</span><span class="strut">&nbsp;</span></p>
+<p id="t771" class="pln"><span class="com">#               Alexander Belchenko.</span><span class="strut">&nbsp;</span></p>
+<p id="t772" 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">&nbsp;</span></p>
+<p id="t773" class="pln"><span class="com">#               the args after each line of an @file.</span><span class="strut">&nbsp;</span></p>
+<p id="t774" class="pln"><span class="com"># 20090520: Use hashlib where it's available, to avoid a warning.</span><span class="strut">&nbsp;</span></p>
+<p id="t775" class="pln"><span class="com">#           Use the builtin compile() instead of compiler, for Jython.</span><span class="strut">&nbsp;</span></p>
+<p id="t776" class="pln"><span class="com">#           Explicitly close files we opened, Jython likes this.</span><span class="strut">&nbsp;</span></p>
+<p id="t777" class="pln"><span class="com"># 20120205: Port to Python 3.  Lowest supported version is 2.6.</span><span class="strut">&nbsp;</span></p>
+<p id="t778" class="pln"><span class="com"># 20150104: --markers option added by Doug Hellmann.</span><span class="strut">&nbsp;</span></p>
+<p id="t779" class="pln"><span class="com"># 20150104: -n ENCODING option added by Petr Gladkiy.</span><span class="strut">&nbsp;</span></p>
+<p id="t780" class="pln"><span class="com"># 20150107: Added --verbose to control what files get listed.</span><span class="strut">&nbsp;</span></p>
+<p id="t781" class="pln"><span class="com"># 20150111: Version 2.4</span><span class="strut">&nbsp;</span></p>
+<p id="t782" class="pln"><span class="com"># 20160213: v2.5: -o makes needed directories, thanks Jean-Fran&#231;ois Giraud.</span><span class="strut">&nbsp;</span></p>
+<p id="t783" class="pln"><span class="com"># 20161019: Added a LICENSE.txt file.</span><span class="strut">&nbsp;</span></p>
 
             </td>
         </tr>
@@ -1643,8 +1647,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_makefiles_py.html b/doc/sample_html/cogapp_makefiles_py.html
index aab49aa4..c40cf856 100644
--- a/doc/sample_html/cogapp_makefiles_py.html
+++ b/doc/sample_html/cogapp_makefiles_py.html
@@ -207,8 +207,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_cogapp_py.html b/doc/sample_html/cogapp_test_cogapp_py.html
index f3d49f90..71f9642a 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: 30.82%</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_cogapp.py</b> :
-            <span class="pc_cov">30.99%</span>
+            <span class="pc_cov">30.82%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
-            704 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">218 run</span>
-            <span class="mis shortkey_m button_toggle_mis">486 missing</span>
+            711 statements &nbsp;
+            <span class="run hide_run shortkey_r button_toggle_run">219 run</span>
+            <span class="mis shortkey_m button_toggle_mis">492 missing</span>
             <span class="exc shortkey_x button_toggle_exc">6 excluded</span>
 
             
@@ -1303,17 +1303,17 @@
 <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="n1235" class="pln"><a href="#n1235">1235</a></p>
+<p id="n1236" class="pln"><a href="#n1236">1236</a></p>
+<p id="n1237" class="pln"><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="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="n1240" class="stm mis"><a href="#n1240">1240</a></p>
+<p id="n1241" class="stm mis"><a href="#n1241">1241</a></p>
 <p id="n1242" class="stm mis"><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>
+<p id="n1244" class="stm run hide_run"><a href="#n1244">1244</a></p>
+<p id="n1245" class="stm mis"><a href="#n1245">1245</a></p>
 <p id="n1246" class="pln"><a href="#n1246">1246</a></p>
 <p id="n1247" class="pln"><a href="#n1247">1247</a></p>
 <p id="n1248" class="pln"><a href="#n1248">1248</a></p>
@@ -1329,67 +1329,67 @@
 <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="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>
-<p id="n1269" class="pln"><a href="#n1269">1269</a></p>
-<p id="n1270" class="pln"><a href="#n1270">1270</a></p>
+<p id="n1261" class="pln"><a href="#n1261">1261</a></p>
+<p id="n1262" class="pln"><a href="#n1262">1262</a></p>
+<p id="n1263" class="pln"><a href="#n1263">1263</a></p>
+<p id="n1264" class="pln"><a href="#n1264">1264</a></p>
+<p id="n1265" class="pln"><a href="#n1265">1265</a></p>
+<p id="n1266" class="stm mis"><a href="#n1266">1266</a></p>
+<p id="n1267" class="stm mis"><a href="#n1267">1267</a></p>
+<p id="n1268" class="stm mis"><a href="#n1268">1268</a></p>
+<p id="n1269" class="stm mis"><a href="#n1269">1269</a></p>
+<p id="n1270" class="stm mis"><a href="#n1270">1270</a></p>
 <p id="n1271" class="pln"><a href="#n1271">1271</a></p>
-<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="n1272" class="stm run hide_run"><a href="#n1272">1272</a></p>
+<p id="n1273" class="stm mis"><a href="#n1273">1273</a></p>
+<p id="n1274" class="pln"><a href="#n1274">1274</a></p>
+<p id="n1275" class="pln"><a href="#n1275">1275</a></p>
+<p id="n1276" class="pln"><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="n1278" class="pln"><a href="#n1278">1278</a></p>
+<p id="n1279" class="pln"><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="pln"><a href="#n1284">1284</a></p>
+<p id="n1285" class="pln"><a href="#n1285">1285</a></p>
+<p id="n1286" class="pln"><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>
-<p id="n1290" class="stm run hide_run"><a href="#n1290">1290</a></p>
+<p id="n1289" class="pln"><a href="#n1289">1289</a></p>
+<p id="n1290" class="pln"><a href="#n1290">1290</a></p>
 <p id="n1291" class="pln"><a href="#n1291">1291</a></p>
-<p id="n1292" class="pln"><a href="#n1292">1292</a></p>
-<p id="n1293" class="pln"><a href="#n1293">1293</a></p>
-<p id="n1294" class="pln"><a href="#n1294">1294</a></p>
-<p id="n1295" class="pln"><a href="#n1295">1295</a></p>
-<p id="n1296" class="pln"><a href="#n1296">1296</a></p>
+<p id="n1292" class="stm mis"><a href="#n1292">1292</a></p>
+<p id="n1293" class="stm mis"><a href="#n1293">1293</a></p>
+<p id="n1294" class="stm mis"><a href="#n1294">1294</a></p>
+<p id="n1295" class="stm mis"><a href="#n1295">1295</a></p>
+<p id="n1296" class="stm mis"><a href="#n1296">1296</a></p>
 <p id="n1297" class="pln"><a href="#n1297">1297</a></p>
 <p id="n1298" class="pln"><a href="#n1298">1298</a></p>
-<p id="n1299" class="pln"><a href="#n1299">1299</a></p>
+<p id="n1299" class="stm run hide_run"><a href="#n1299">1299</a></p>
 <p id="n1300" class="pln"><a href="#n1300">1300</a></p>
 <p id="n1301" class="pln"><a href="#n1301">1301</a></p>
 <p id="n1302" class="pln"><a href="#n1302">1302</a></p>
 <p id="n1303" class="pln"><a href="#n1303">1303</a></p>
 <p id="n1304" class="pln"><a href="#n1304">1304</a></p>
-<p id="n1305" class="pln"><a href="#n1305">1305</a></p>
-<p id="n1306" class="pln"><a href="#n1306">1306</a></p>
-<p id="n1307" class="pln"><a href="#n1307">1307</a></p>
+<p id="n1305" class="stm run hide_run"><a href="#n1305">1305</a></p>
+<p id="n1306" class="stm mis"><a href="#n1306">1306</a></p>
+<p id="n1307" class="stm mis"><a href="#n1307">1307</a></p>
 <p id="n1308" class="pln"><a href="#n1308">1308</a></p>
-<p id="n1309" class="pln"><a href="#n1309">1309</a></p>
-<p id="n1310" class="pln"><a href="#n1310">1310</a></p>
+<p id="n1309" class="stm run hide_run"><a href="#n1309">1309</a></p>
+<p id="n1310" class="stm mis"><a href="#n1310">1310</a></p>
 <p id="n1311" class="pln"><a href="#n1311">1311</a></p>
 <p id="n1312" class="pln"><a href="#n1312">1312</a></p>
 <p id="n1313" class="pln"><a href="#n1313">1313</a></p>
 <p id="n1314" class="pln"><a href="#n1314">1314</a></p>
-<p id="n1315" class="pln"><a href="#n1315">1315</a></p>
-<p id="n1316" class="pln"><a href="#n1316">1316</a></p>
-<p id="n1317" class="pln"><a href="#n1317">1317</a></p>
+<p id="n1315" class="stm mis"><a href="#n1315">1315</a></p>
+<p id="n1316" class="stm mis"><a href="#n1316">1316</a></p>
+<p id="n1317" class="stm mis"><a href="#n1317">1317</a></p>
 <p id="n1318" class="pln"><a href="#n1318">1318</a></p>
 <p id="n1319" class="pln"><a href="#n1319">1319</a></p>
-<p id="n1320" class="pln"><a href="#n1320">1320</a></p>
-<p id="n1321" class="pln"><a href="#n1321">1321</a></p>
+<p id="n1320" class="stm run hide_run"><a href="#n1320">1320</a></p>
+<p id="n1321" class="stm run hide_run"><a href="#n1321">1321</a></p>
 <p id="n1322" class="pln"><a href="#n1322">1322</a></p>
 <p id="n1323" class="pln"><a href="#n1323">1323</a></p>
 <p id="n1324" class="pln"><a href="#n1324">1324</a></p>
@@ -1404,120 +1404,120 @@
 <p id="n1333" class="pln"><a href="#n1333">1333</a></p>
 <p id="n1334" class="pln"><a href="#n1334">1334</a></p>
 <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="n1336" class="pln"><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="pln"><a href="#n1338">1338</a></p>
+<p id="n1339" class="pln"><a href="#n1339">1339</a></p>
+<p id="n1340" class="pln"><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="n1342" class="pln"><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="pln"><a href="#n1344">1344</a></p>
+<p id="n1345" class="pln"><a href="#n1345">1345</a></p>
+<p id="n1346" class="pln"><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="n1348" class="pln"><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="pln"><a href="#n1350">1350</a></p>
+<p id="n1351" class="pln"><a href="#n1351">1351</a></p>
+<p id="n1352" class="pln"><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="n1354" class="pln"><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="pln"><a href="#n1356">1356</a></p>
+<p id="n1357" class="pln"><a href="#n1357">1357</a></p>
+<p id="n1358" class="pln"><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="n1360" class="pln"><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="pln"><a href="#n1362">1362</a></p>
+<p id="n1363" class="pln"><a href="#n1363">1363</a></p>
+<p id="n1364" class="pln"><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="n1366" class="pln"><a href="#n1366">1366</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>
-<p id="n1371" class="pln"><a href="#n1371">1371</a></p>
+<p id="n1369" class="stm mis"><a href="#n1369">1369</a></p>
+<p id="n1370" class="stm mis"><a href="#n1370">1370</a></p>
+<p id="n1371" class="stm mis"><a href="#n1371">1371</a></p>
 <p id="n1372" class="pln"><a href="#n1372">1372</a></p>
-<p id="n1373" class="pln"><a href="#n1373">1373</a></p>
+<p id="n1373" class="stm run hide_run"><a href="#n1373">1373</a></p>
 <p id="n1374" class="pln"><a href="#n1374">1374</a></p>
-<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="n1379" class="pln"><a href="#n1379">1379</a></p>
-<p id="n1380" class="stm mis"><a href="#n1380">1380</a></p>
+<p id="n1375" class="stm mis"><a href="#n1375">1375</a></p>
+<p id="n1376" class="stm mis"><a href="#n1376">1376</a></p>
+<p id="n1377" class="stm mis"><a href="#n1377">1377</a></p>
+<p id="n1378" class="pln"><a href="#n1378">1378</a></p>
+<p id="n1379" class="stm run hide_run"><a href="#n1379">1379</a></p>
+<p id="n1380" class="pln"><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="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="n1387" class="pln"><a href="#n1387">1387</a></p>
+<p id="n1383" class="stm mis"><a href="#n1383">1383</a></p>
+<p id="n1384" class="pln"><a href="#n1384">1384</a></p>
+<p id="n1385" class="stm run hide_run"><a href="#n1385">1385</a></p>
+<p id="n1386" class="pln"><a href="#n1386">1386</a></p>
+<p id="n1387" class="stm mis"><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="n1391" class="pln"><a href="#n1391">1391</a></p>
-<p id="n1392" class="stm mis"><a href="#n1392">1392</a></p>
+<p id="n1390" class="pln"><a href="#n1390">1390</a></p>
+<p id="n1391" class="stm run hide_run"><a href="#n1391">1391</a></p>
+<p id="n1392" class="pln"><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="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="n1395" class="stm mis"><a href="#n1395">1395</a></p>
+<p id="n1396" class="pln"><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 mis"><a href="#n1398">1398</a></p>
-<p id="n1399" class="stm mis"><a href="#n1399">1399</a></p>
+<p id="n1399" class="pln"><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="pln"><a href="#n1401">1401</a></p>
+<p id="n1402" class="pln"><a href="#n1402">1402</a></p>
+<p id="n1403" class="pln"><a href="#n1403">1403</a></p>
+<p id="n1404" class="pln"><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="n1406" class="pln"><a href="#n1406">1406</a></p>
+<p id="n1407" class="pln"><a href="#n1407">1407</a></p>
+<p id="n1408" class="pln"><a href="#n1408">1408</a></p>
 <p id="n1409" class="stm mis"><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="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>
+<p id="n1411" class="stm mis"><a href="#n1411">1411</a></p>
+<p id="n1412" class="stm mis"><a href="#n1412">1412</a></p>
+<p id="n1413" class="stm mis"><a href="#n1413">1413</a></p>
+<p id="n1414" class="pln"><a href="#n1414">1414</a></p>
+<p id="n1415" class="stm mis"><a href="#n1415">1415</a></p>
+<p id="n1416" class="stm mis"><a href="#n1416">1416</a></p>
+<p id="n1417" class="stm mis"><a href="#n1417">1417</a></p>
 <p id="n1418" class="pln"><a href="#n1418">1418</a></p>
-<p id="n1419" class="pln"><a href="#n1419">1419</a></p>
-<p id="n1420" class="pln"><a href="#n1420">1420</a></p>
-<p id="n1421" class="pln"><a href="#n1421">1421</a></p>
+<p id="n1419" class="stm mis"><a href="#n1419">1419</a></p>
+<p id="n1420" class="stm mis"><a href="#n1420">1420</a></p>
+<p id="n1421" class="stm mis"><a href="#n1421">1421</a></p>
 <p id="n1422" class="pln"><a href="#n1422">1422</a></p>
-<p id="n1423" class="pln"><a href="#n1423">1423</a></p>
-<p id="n1424" class="pln"><a href="#n1424">1424</a></p>
-<p id="n1425" class="pln"><a href="#n1425">1425</a></p>
+<p id="n1423" class="stm mis"><a href="#n1423">1423</a></p>
+<p id="n1424" class="stm mis"><a href="#n1424">1424</a></p>
+<p id="n1425" class="stm mis"><a href="#n1425">1425</a></p>
 <p id="n1426" class="pln"><a href="#n1426">1426</a></p>
-<p id="n1427" class="pln"><a href="#n1427">1427</a></p>
-<p id="n1428" class="pln"><a href="#n1428">1428</a></p>
-<p id="n1429" class="pln"><a href="#n1429">1429</a></p>
-<p id="n1430" class="pln"><a href="#n1430">1430</a></p>
+<p id="n1427" class="stm mis"><a href="#n1427">1427</a></p>
+<p id="n1428" class="stm mis"><a href="#n1428">1428</a></p>
+<p id="n1429" class="stm mis"><a href="#n1429">1429</a></p>
+<p id="n1430" class="stm mis"><a href="#n1430">1430</a></p>
 <p id="n1431" class="pln"><a href="#n1431">1431</a></p>
-<p id="n1432" class="pln"><a href="#n1432">1432</a></p>
-<p id="n1433" class="pln"><a href="#n1433">1433</a></p>
-<p id="n1434" class="pln"><a href="#n1434">1434</a></p>
-<p id="n1435" class="pln"><a href="#n1435">1435</a></p>
+<p id="n1432" class="stm mis"><a href="#n1432">1432</a></p>
+<p id="n1433" class="stm mis"><a href="#n1433">1433</a></p>
+<p id="n1434" class="stm mis"><a href="#n1434">1434</a></p>
+<p id="n1435" class="stm mis"><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="n1437" class="stm mis"><a href="#n1437">1437</a></p>
 <p id="n1438" class="stm mis"><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="n1439" class="stm mis"><a href="#n1439">1439</a></p>
+<p id="n1440" class="stm mis"><a href="#n1440">1440</a></p>
+<p id="n1441" class="pln"><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="n1445" class="stm mis"><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="n1447" class="pln"><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="pln"><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,23 +1532,23 @@
 <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="n1464" class="pln"><a href="#n1464">1464</a></p>
+<p id="n1465" class="pln"><a href="#n1465">1465</a></p>
+<p id="n1466" class="pln"><a href="#n1466">1466</a></p>
+<p id="n1467" class="pln"><a href="#n1467">1467</a></p>
+<p id="n1468" class="pln"><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="n1470" class="pln"><a href="#n1470">1470</a></p>
+<p id="n1471" class="pln"><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="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="n1474" class="pln"><a href="#n1474">1474</a></p>
+<p id="n1475" class="pln"><a href="#n1475">1475</a></p>
+<p id="n1476" class="stm run hide_run"><a href="#n1476">1476</a></p>
+<p id="n1477" class="pln"><a href="#n1477">1477</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="n1480" class="stm mis"><a href="#n1480">1480</a></p>
 <p id="n1481" class="pln"><a href="#n1481">1481</a></p>
 <p id="n1482" class="pln"><a href="#n1482">1482</a></p>
 <p id="n1483" class="pln"><a href="#n1483">1483</a></p>
@@ -1563,25 +1563,25 @@
 <p id="n1492" class="pln"><a href="#n1492">1492</a></p>
 <p id="n1493" class="pln"><a href="#n1493">1493</a></p>
 <p id="n1494" class="pln"><a href="#n1494">1494</a></p>
-<p id="n1495" class="pln"><a href="#n1495">1495</a></p>
-<p id="n1496" class="pln"><a href="#n1496">1496</a></p>
-<p id="n1497" class="pln"><a href="#n1497">1497</a></p>
-<p id="n1498" class="pln"><a href="#n1498">1498</a></p>
-<p id="n1499" class="pln"><a href="#n1499">1499</a></p>
-<p id="n1500" class="pln"><a href="#n1500">1500</a></p>
-<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="n1495" class="stm mis"><a href="#n1495">1495</a></p>
+<p id="n1496" class="stm mis"><a href="#n1496">1496</a></p>
+<p id="n1497" class="stm mis"><a href="#n1497">1497</a></p>
+<p id="n1498" class="stm mis"><a href="#n1498">1498</a></p>
+<p id="n1499" class="stm mis"><a href="#n1499">1499</a></p>
+<p id="n1500" class="stm mis"><a href="#n1500">1500</a></p>
+<p id="n1501" class="stm mis"><a href="#n1501">1501</a></p>
+<p id="n1502" class="stm mis"><a href="#n1502">1502</a></p>
+<p id="n1503" class="stm mis"><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="n1507" class="pln"><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 mis"><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="n1511" class="pln"><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="pln"><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>
@@ -1603,16 +1603,16 @@
 <p id="n1532" class="pln"><a href="#n1532">1532</a></p>
 <p id="n1533" class="pln"><a href="#n1533">1533</a></p>
 <p id="n1534" class="pln"><a href="#n1534">1534</a></p>
-<p id="n1535" class="pln"><a href="#n1535">1535</a></p>
-<p id="n1536" class="pln"><a href="#n1536">1536</a></p>
-<p id="n1537" class="pln"><a href="#n1537">1537</a></p>
-<p id="n1538" class="pln"><a href="#n1538">1538</a></p>
-<p id="n1539" class="pln"><a href="#n1539">1539</a></p>
-<p id="n1540" class="pln"><a href="#n1540">1540</a></p>
+<p id="n1535" class="stm mis"><a href="#n1535">1535</a></p>
+<p id="n1536" class="stm mis"><a href="#n1536">1536</a></p>
+<p id="n1537" class="stm mis"><a href="#n1537">1537</a></p>
+<p id="n1538" class="stm mis"><a href="#n1538">1538</a></p>
+<p id="n1539" class="stm mis"><a href="#n1539">1539</a></p>
+<p id="n1540" class="stm mis"><a href="#n1540">1540</a></p>
 <p id="n1541" class="pln"><a href="#n1541">1541</a></p>
-<p id="n1542" class="pln"><a href="#n1542">1542</a></p>
+<p id="n1542" class="stm run hide_run"><a href="#n1542">1542</a></p>
 <p id="n1543" class="pln"><a href="#n1543">1543</a></p>
-<p id="n1544" class="pln"><a href="#n1544">1544</a></p>
+<p id="n1544" class="stm mis"><a href="#n1544">1544</a></p>
 <p id="n1545" class="pln"><a href="#n1545">1545</a></p>
 <p id="n1546" class="pln"><a href="#n1546">1546</a></p>
 <p id="n1547" class="pln"><a href="#n1547">1547</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="pln"><a href="#n1558">1558</a></p>
+<p id="n1559" class="pln"><a href="#n1559">1559</a></p>
+<p id="n1560" class="pln"><a href="#n1560">1560</a></p>
+<p id="n1561" class="pln"><a href="#n1561">1561</a></p>
+<p id="n1562" class="pln"><a href="#n1562">1562</a></p>
+<p id="n1563" class="pln"><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="n1565" class="pln"><a href="#n1565">1565</a></p>
+<p id="n1566" class="pln"><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>
@@ -1657,71 +1657,71 @@
 <p id="n1586" class="pln"><a href="#n1586">1586</a></p>
 <p id="n1587" class="pln"><a href="#n1587">1587</a></p>
 <p id="n1588" class="pln"><a href="#n1588">1588</a></p>
-<p id="n1589" class="pln"><a href="#n1589">1589</a></p>
-<p id="n1590" class="pln"><a href="#n1590">1590</a></p>
-<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="n1589" class="stm mis"><a href="#n1589">1589</a></p>
+<p id="n1590" class="stm mis"><a href="#n1590">1590</a></p>
+<p id="n1591" class="stm mis"><a href="#n1591">1591</a></p>
+<p id="n1592" class="stm mis"><a href="#n1592">1592</a></p>
+<p id="n1593" class="stm mis"><a href="#n1593">1593</a></p>
 <p id="n1594" class="stm mis"><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="n1596" class="stm run hide_run"><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="n1598" class="pln"><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="pln"><a href="#n1600">1600</a></p>
+<p id="n1601" class="pln"><a href="#n1601">1601</a></p>
+<p id="n1602" class="pln"><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="pln"><a href="#n1604">1604</a></p>
+<p id="n1605" class="pln"><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="n1607" class="pln"><a href="#n1607">1607</a></p>
+<p id="n1608" class="pln"><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="pln"><a href="#n1614">1614</a></p>
+<p id="n1615" class="pln"><a href="#n1615">1615</a></p>
+<p id="n1616" class="pln"><a href="#n1616">1616</a></p>
+<p id="n1617" class="pln"><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="n1619" class="pln"><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="pln"><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>
+<p id="n1625" class="stm mis"><a href="#n1625">1625</a></p>
 <p id="n1626" class="pln"><a href="#n1626">1626</a></p>
-<p id="n1627" class="pln"><a href="#n1627">1627</a></p>
-<p id="n1628" class="pln"><a href="#n1628">1628</a></p>
-<p id="n1629" class="pln"><a href="#n1629">1629</a></p>
+<p id="n1627" class="stm mis"><a href="#n1627">1627</a></p>
+<p id="n1628" class="stm mis"><a href="#n1628">1628</a></p>
+<p id="n1629" class="stm mis"><a href="#n1629">1629</a></p>
 <p id="n1630" class="pln"><a href="#n1630">1630</a></p>
-<p id="n1631" class="pln"><a href="#n1631">1631</a></p>
-<p id="n1632" class="pln"><a href="#n1632">1632</a></p>
-<p id="n1633" class="pln"><a href="#n1633">1633</a></p>
+<p id="n1631" class="stm mis"><a href="#n1631">1631</a></p>
+<p id="n1632" class="stm mis"><a href="#n1632">1632</a></p>
+<p id="n1633" class="stm mis"><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="n1635" class="stm mis"><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="n1637" class="pln"><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 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="n1640" class="pln"><a href="#n1640">1640</a></p>
+<p id="n1641" class="pln"><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="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>
-<p id="n1648" class="pln"><a href="#n1648">1648</a></p>
+<p id="n1643" class="pln"><a href="#n1643">1643</a></p>
+<p id="n1644" class="pln"><a href="#n1644">1644</a></p>
+<p id="n1645" class="stm mis"><a href="#n1645">1645</a></p>
+<p id="n1646" class="stm mis"><a href="#n1646">1646</a></p>
+<p id="n1647" class="stm mis"><a href="#n1647">1647</a></p>
+<p id="n1648" class="stm mis"><a href="#n1648">1648</a></p>
 <p id="n1649" class="pln"><a href="#n1649">1649</a></p>
-<p id="n1650" class="pln"><a href="#n1650">1650</a></p>
+<p id="n1650" class="stm run hide_run"><a href="#n1650">1650</a></p>
 <p id="n1651" class="pln"><a href="#n1651">1651</a></p>
 <p id="n1652" class="pln"><a href="#n1652">1652</a></p>
-<p id="n1653" class="pln"><a href="#n1653">1653</a></p>
+<p id="n1653" class="stm mis"><a href="#n1653">1653</a></p>
 <p id="n1654" class="pln"><a href="#n1654">1654</a></p>
 <p id="n1655" class="pln"><a href="#n1655">1655</a></p>
 <p id="n1656" class="pln"><a href="#n1656">1656</a></p>
@@ -1731,91 +1731,91 @@
 <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="n1663" class="pln"><a href="#n1663">1663</a></p>
+<p id="n1664" class="pln"><a href="#n1664">1664</a></p>
+<p id="n1665" class="pln"><a href="#n1665">1665</a></p>
+<p id="n1666" class="pln"><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="n1673" class="pln"><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 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="n1676" class="pln"><a href="#n1676">1676</a></p>
+<p id="n1677" class="pln"><a href="#n1677">1677</a></p>
+<p id="n1678" class="pln"><a href="#n1678">1678</a></p>
+<p id="n1679" class="pln"><a href="#n1679">1679</a></p>
+<p id="n1680" class="pln"><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="n1682" class="pln"><a href="#n1682">1682</a></p>
+<p id="n1683" class="pln"><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="n1690" class="pln"><a href="#n1690">1690</a></p>
+<p id="n1691" class="pln"><a href="#n1691">1691</a></p>
+<p id="n1692" class="pln"><a href="#n1692">1692</a></p>
+<p id="n1693" class="pln"><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="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="n1698" class="stm mis"><a href="#n1698">1698</a></p>
+<p id="n1699" class="stm mis"><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="n1705" class="pln"><a href="#n1705">1705</a></p>
+<p id="n1705" class="stm mis"><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="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="n1712" class="pln"><a href="#n1712">1712</a></p>
+<p id="n1713" class="stm run hide_run"><a href="#n1713">1713</a></p>
+<p id="n1714" class="stm mis"><a href="#n1714">1714</a></p>
+<p id="n1715" class="pln"><a href="#n1715">1715</a></p>
+<p id="n1716" class="pln"><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>
 <p id="n1720" class="pln"><a href="#n1720">1720</a></p>
-<p id="n1721" class="pln"><a href="#n1721">1721</a></p>
-<p id="n1722" class="pln"><a href="#n1722">1722</a></p>
-<p id="n1723" class="pln"><a href="#n1723">1723</a></p>
-<p id="n1724" class="pln"><a href="#n1724">1724</a></p>
-<p id="n1725" class="pln"><a href="#n1725">1725</a></p>
-<p id="n1726" class="pln"><a href="#n1726">1726</a></p>
-<p id="n1727" class="pln"><a href="#n1727">1727</a></p>
-<p id="n1728" class="pln"><a href="#n1728">1728</a></p>
+<p id="n1721" class="stm mis"><a href="#n1721">1721</a></p>
+<p id="n1722" class="stm mis"><a href="#n1722">1722</a></p>
+<p id="n1723" class="stm mis"><a href="#n1723">1723</a></p>
+<p id="n1724" class="stm mis"><a href="#n1724">1724</a></p>
+<p id="n1725" class="stm mis"><a href="#n1725">1725</a></p>
+<p id="n1726" class="stm mis"><a href="#n1726">1726</a></p>
+<p id="n1727" class="stm mis"><a href="#n1727">1727</a></p>
+<p id="n1728" class="stm mis"><a href="#n1728">1728</a></p>
 <p id="n1729" class="pln"><a href="#n1729">1729</a></p>
-<p id="n1730" class="pln"><a href="#n1730">1730</a></p>
-<p id="n1731" class="pln"><a href="#n1731">1731</a></p>
-<p id="n1732" class="pln"><a href="#n1732">1732</a></p>
-<p id="n1733" class="pln"><a href="#n1733">1733</a></p>
-<p id="n1734" class="pln"><a href="#n1734">1734</a></p>
-<p id="n1735" class="pln"><a href="#n1735">1735</a></p>
+<p id="n1730" class="stm run hide_run"><a href="#n1730">1730</a></p>
+<p id="n1731" class="stm mis"><a href="#n1731">1731</a></p>
+<p id="n1732" class="stm mis"><a href="#n1732">1732</a></p>
+<p id="n1733" class="stm mis"><a href="#n1733">1733</a></p>
+<p id="n1734" class="stm mis"><a href="#n1734">1734</a></p>
+<p id="n1735" class="stm mis"><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="n1737" class="stm mis"><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="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="n1741" class="stm mis"><a href="#n1741">1741</a></p>
+<p id="n1742" class="stm mis"><a href="#n1742">1742</a></p>
 <p id="n1743" class="stm mis"><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>
-<p id="n1747" class="pln"><a href="#n1747">1747</a></p>
+<p id="n1746" class="stm run hide_run"><a href="#n1746">1746</a></p>
+<p id="n1747" class="stm mis"><a href="#n1747">1747</a></p>
 <p id="n1748" class="pln"><a href="#n1748">1748</a></p>
 <p id="n1749" class="pln"><a href="#n1749">1749</a></p>
 <p id="n1750" class="pln"><a href="#n1750">1750</a></p>
@@ -1826,43 +1826,43 @@
 <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="pln"><a href="#n1758">1758</a></p>
+<p id="n1759" class="pln"><a href="#n1759">1759</a></p>
+<p id="n1760" class="pln"><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="n1762" class="pln"><a href="#n1762">1762</a></p>
+<p id="n1763" class="pln"><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>
 <p id="n1767" class="pln"><a href="#n1767">1767</a></p>
 <p id="n1768" class="pln"><a href="#n1768">1768</a></p>
-<p id="n1769" class="pln"><a href="#n1769">1769</a></p>
-<p id="n1770" class="pln"><a href="#n1770">1770</a></p>
-<p id="n1771" class="pln"><a href="#n1771">1771</a></p>
+<p id="n1769" class="stm mis"><a href="#n1769">1769</a></p>
+<p id="n1770" class="stm mis"><a href="#n1770">1770</a></p>
+<p id="n1771" class="stm mis"><a href="#n1771">1771</a></p>
 <p id="n1772" class="pln"><a href="#n1772">1772</a></p>
-<p id="n1773" class="pln"><a href="#n1773">1773</a></p>
-<p id="n1774" class="pln"><a href="#n1774">1774</a></p>
+<p id="n1773" class="stm run hide_run"><a href="#n1773">1773</a></p>
+<p id="n1774" class="stm mis"><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="pln"><a href="#n1776">1776</a></p>
+<p id="n1777" class="pln"><a href="#n1777">1777</a></p>
+<p id="n1778" class="pln"><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>
+<p id="n1781" class="pln"><a href="#n1781">1781</a></p>
 <p id="n1782" class="pln"><a href="#n1782">1782</a></p>
-<p id="n1783" class="stm run hide_run"><a href="#n1783">1783</a></p>
+<p id="n1783" class="pln"><a href="#n1783">1783</a></p>
 <p id="n1784" class="pln"><a href="#n1784">1784</a></p>
 <p id="n1785" class="pln"><a href="#n1785">1785</a></p>
 <p id="n1786" class="pln"><a href="#n1786">1786</a></p>
 <p id="n1787" class="pln"><a href="#n1787">1787</a></p>
 <p id="n1788" class="pln"><a href="#n1788">1788</a></p>
-<p id="n1789" class="pln"><a href="#n1789">1789</a></p>
-<p id="n1790" class="pln"><a href="#n1790">1790</a></p>
-<p id="n1791" class="pln"><a href="#n1791">1791</a></p>
+<p id="n1789" class="stm mis"><a href="#n1789">1789</a></p>
+<p id="n1790" class="stm mis"><a href="#n1790">1790</a></p>
+<p id="n1791" class="stm mis"><a href="#n1791">1791</a></p>
 <p id="n1792" class="pln"><a href="#n1792">1792</a></p>
-<p id="n1793" class="pln"><a href="#n1793">1793</a></p>
-<p id="n1794" class="pln"><a href="#n1794">1794</a></p>
+<p id="n1793" class="stm run hide_run"><a href="#n1793">1793</a></p>
+<p id="n1794" class="stm mis"><a href="#n1794">1794</a></p>
 <p id="n1795" class="pln"><a href="#n1795">1795</a></p>
 <p id="n1796" class="pln"><a href="#n1796">1796</a></p>
 <p id="n1797" class="pln"><a href="#n1797">1797</a></p>
@@ -1872,82 +1872,82 @@
 <p id="n1801" class="pln"><a href="#n1801">1801</a></p>
 <p id="n1802" class="pln"><a href="#n1802">1802</a></p>
 <p id="n1803" class="pln"><a href="#n1803">1803</a></p>
-<p id="n1804" class="exc"><a href="#n1804">1804</a></p>
+<p id="n1804" class="pln"><a href="#n1804">1804</a></p>
 <p id="n1805" class="pln"><a href="#n1805">1805</a></p>
-<p id="n1806" class="exc"><a href="#n1806">1806</a></p>
-<p id="n1807" class="exc"><a href="#n1807">1807</a></p>
-<p id="n1808" class="exc"><a href="#n1808">1808</a></p>
-<p id="n1809" class="pln"><a href="#n1809">1809</a></p>
-<p id="n1810" class="exc"><a href="#n1810">1810</a></p>
-<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="n1806" class="pln"><a href="#n1806">1806</a></p>
+<p id="n1807" class="stm mis"><a href="#n1807">1807</a></p>
+<p id="n1808" class="stm mis"><a href="#n1808">1808</a></p>
+<p id="n1809" class="stm mis"><a href="#n1809">1809</a></p>
+<p id="n1810" class="pln"><a href="#n1810">1810</a></p>
+<p id="n1811" class="pln"><a href="#n1811">1811</a></p>
+<p id="n1812" class="stm run hide_run"><a href="#n1812">1812</a></p>
+<p id="n1813" class="pln"><a href="#n1813">1813</a></p>
+<p id="n1814" class="stm run hide_run"><a href="#n1814">1814</a></p>
+<p id="n1815" class="pln"><a href="#n1815">1815</a></p>
+<p id="n1816" class="pln"><a href="#n1816">1816</a></p>
+<p id="n1817" class="pln"><a href="#n1817">1817</a></p>
+<p id="n1818" class="pln"><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="n1820" class="pln"><a href="#n1820">1820</a></p>
+<p id="n1821" class="pln"><a href="#n1821">1821</a></p>
+<p id="n1822" class="pln"><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="n1824" class="pln"><a href="#n1824">1824</a></p>
+<p id="n1825" class="pln"><a href="#n1825">1825</a></p>
+<p id="n1826" class="pln"><a href="#n1826">1826</a></p>
+<p id="n1827" class="pln"><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="n1829" class="pln"><a href="#n1829">1829</a></p>
+<p id="n1830" class="pln"><a href="#n1830">1830</a></p>
+<p id="n1831" class="pln"><a href="#n1831">1831</a></p>
+<p id="n1832" class="pln"><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="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="n1834" class="pln"><a href="#n1834">1834</a></p>
+<p id="n1835" class="exc"><a href="#n1835">1835</a></p>
+<p id="n1836" class="pln"><a href="#n1836">1836</a></p>
+<p id="n1837" class="exc"><a href="#n1837">1837</a></p>
+<p id="n1838" class="exc"><a href="#n1838">1838</a></p>
+<p id="n1839" class="exc"><a href="#n1839">1839</a></p>
+<p id="n1840" class="pln"><a href="#n1840">1840</a></p>
+<p id="n1841" class="exc"><a href="#n1841">1841</a></p>
+<p id="n1842" class="exc"><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="n1844" class="stm run hide_run"><a href="#n1844">1844</a></p>
+<p id="n1845" class="stm mis"><a href="#n1845">1845</a></p>
+<p id="n1846" class="stm mis"><a href="#n1846">1846</a></p>
+<p id="n1847" class="stm mis"><a href="#n1847">1847</a></p>
 <p id="n1848" class="stm mis"><a href="#n1848">1848</a></p>
-<p id="n1849" class="pln"><a href="#n1849">1849</a></p>
+<p id="n1849" class="stm mis"><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>
-<p id="n1852" class="pln"><a href="#n1852">1852</a></p>
-<p id="n1853" class="pln"><a href="#n1853">1853</a></p>
+<p id="n1851" class="stm run hide_run"><a href="#n1851">1851</a></p>
+<p id="n1852" class="stm mis"><a href="#n1852">1852</a></p>
+<p id="n1853" class="stm mis"><a href="#n1853">1853</a></p>
 <p id="n1854" class="pln"><a href="#n1854">1854</a></p>
-<p id="n1855" class="pln"><a href="#n1855">1855</a></p>
-<p id="n1856" class="pln"><a href="#n1856">1856</a></p>
-<p id="n1857" class="pln"><a href="#n1857">1857</a></p>
-<p id="n1858" class="pln"><a href="#n1858">1858</a></p>
+<p id="n1855" class="stm run hide_run"><a href="#n1855">1855</a></p>
+<p id="n1856" class="stm mis"><a href="#n1856">1856</a></p>
+<p id="n1857" class="stm mis"><a href="#n1857">1857</a></p>
+<p id="n1858" class="stm mis"><a href="#n1858">1858</a></p>
 <p id="n1859" class="pln"><a href="#n1859">1859</a></p>
-<p id="n1860" class="pln"><a href="#n1860">1860</a></p>
-<p id="n1861" class="pln"><a href="#n1861">1861</a></p>
-<p id="n1862" class="pln"><a href="#n1862">1862</a></p>
-<p id="n1863" class="pln"><a href="#n1863">1863</a></p>
+<p id="n1860" class="stm run hide_run"><a href="#n1860">1860</a></p>
+<p id="n1861" class="stm mis"><a href="#n1861">1861</a></p>
+<p id="n1862" class="stm mis"><a href="#n1862">1862</a></p>
+<p id="n1863" class="stm mis"><a href="#n1863">1863</a></p>
 <p id="n1864" class="pln"><a href="#n1864">1864</a></p>
-<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="n1865" class="stm run hide_run"><a href="#n1865">1865</a></p>
+<p id="n1866" class="stm mis"><a href="#n1866">1866</a></p>
+<p id="n1867" class="stm mis"><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="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="n1869" class="pln"><a href="#n1869">1869</a></p>
+<p id="n1870" class="stm run hide_run"><a href="#n1870">1870</a></p>
+<p id="n1871" class="stm mis"><a href="#n1871">1871</a></p>
+<p id="n1872" class="stm mis"><a href="#n1872">1872</a></p>
 <p id="n1873" class="stm mis"><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>
+<p id="n1876" class="stm run hide_run"><a href="#n1876">1876</a></p>
 <p id="n1877" class="pln"><a href="#n1877">1877</a></p>
-<p id="n1878" class="pln"><a href="#n1878">1878</a></p>
-<p id="n1879" class="pln"><a href="#n1879">1879</a></p>
+<p id="n1878" class="stm run hide_run"><a href="#n1878">1878</a></p>
+<p id="n1879" class="stm mis"><a href="#n1879">1879</a></p>
 <p id="n1880" class="pln"><a href="#n1880">1880</a></p>
 <p id="n1881" class="pln"><a href="#n1881">1881</a></p>
 <p id="n1882" class="pln"><a href="#n1882">1882</a></p>
@@ -1965,14 +1965,14 @@
 <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="n1897" class="pln"><a href="#n1897">1897</a></p>
+<p id="n1898" class="pln"><a href="#n1898">1898</a></p>
 <p id="n1899" class="stm mis"><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="n1903" class="pln"><a href="#n1903">1903</a></p>
-<p id="n1904" class="pln"><a href="#n1904">1904</a></p>
+<p id="n1900" class="stm mis"><a href="#n1900">1900</a></p>
+<p id="n1901" class="stm mis"><a href="#n1901">1901</a></p>
+<p id="n1902" class="pln"><a href="#n1902">1902</a></p>
+<p id="n1903" class="stm run hide_run"><a href="#n1903">1903</a></p>
+<p id="n1904" class="stm mis"><a href="#n1904">1904</a></p>
 <p id="n1905" class="pln"><a href="#n1905">1905</a></p>
 <p id="n1906" class="pln"><a href="#n1906">1906</a></p>
 <p id="n1907" class="pln"><a href="#n1907">1907</a></p>
@@ -1994,14 +1994,14 @@
 <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="n1926" class="pln"><a href="#n1926">1926</a></p>
+<p id="n1927" class="pln"><a href="#n1927">1927</a></p>
 <p id="n1928" class="stm mis"><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="n1932" class="pln"><a href="#n1932">1932</a></p>
-<p id="n1933" class="pln"><a href="#n1933">1933</a></p>
+<p id="n1929" class="stm mis"><a href="#n1929">1929</a></p>
+<p id="n1930" class="stm mis"><a href="#n1930">1930</a></p>
+<p id="n1931" class="pln"><a href="#n1931">1931</a></p>
+<p id="n1932" class="stm run hide_run"><a href="#n1932">1932</a></p>
+<p id="n1933" class="stm mis"><a href="#n1933">1933</a></p>
 <p id="n1934" class="pln"><a href="#n1934">1934</a></p>
 <p id="n1935" class="pln"><a href="#n1935">1935</a></p>
 <p id="n1936" class="pln"><a href="#n1936">1936</a></p>
@@ -2025,12 +2025,12 @@
 <p id="n1954" class="pln"><a href="#n1954">1954</a></p>
 <p id="n1955" class="pln"><a href="#n1955">1955</a></p>
 <p id="n1956" class="pln"><a href="#n1956">1956</a></p>
-<p id="n1957" class="pln"><a href="#n1957">1957</a></p>
-<p id="n1958" class="pln"><a href="#n1958">1958</a></p>
-<p id="n1959" class="pln"><a href="#n1959">1959</a></p>
+<p id="n1957" class="stm mis"><a href="#n1957">1957</a></p>
+<p id="n1958" class="stm mis"><a href="#n1958">1958</a></p>
+<p id="n1959" class="stm mis"><a href="#n1959">1959</a></p>
 <p id="n1960" class="pln"><a href="#n1960">1960</a></p>
-<p id="n1961" class="pln"><a href="#n1961">1961</a></p>
-<p id="n1962" class="pln"><a href="#n1962">1962</a></p>
+<p id="n1961" class="stm run hide_run"><a href="#n1961">1961</a></p>
+<p id="n1962" class="stm mis"><a href="#n1962">1962</a></p>
 <p id="n1963" class="pln"><a href="#n1963">1963</a></p>
 <p id="n1964" class="pln"><a href="#n1964">1964</a></p>
 <p id="n1965" class="pln"><a href="#n1965">1965</a></p>
@@ -2072,68 +2072,68 @@
 <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="pln"><a href="#n2004">2004</a></p>
+<p id="n2005" class="pln"><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="pln"><a href="#n2007">2007</a></p>
+<p id="n2008" class="pln"><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="pln"><a href="#n2010">2010</a></p>
+<p id="n2011" class="pln"><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="pln"><a href="#n2013">2013</a></p>
+<p id="n2014" class="pln"><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="pln"><a href="#n2016">2016</a></p>
+<p id="n2017" class="pln"><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="pln"><a href="#n2019">2019</a></p>
+<p id="n2020" class="pln"><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="pln"><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="n2024" class="pln"><a href="#n2024">2024</a></p>
+<p id="n2025" class="pln"><a href="#n2025">2025</a></p>
+<p id="n2026" class="pln"><a href="#n2026">2026</a></p>
+<p id="n2027" class="pln"><a href="#n2027">2027</a></p>
+<p id="n2028" class="pln"><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="n2031" class="pln"><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="n2035" class="pln"><a href="#n2035">2035</a></p>
-<p id="n2036" class="pln"><a href="#n2036">2036</a></p>
+<p id="n2033" class="pln"><a href="#n2033">2033</a></p>
+<p id="n2034" class="pln"><a href="#n2034">2034</a></p>
+<p id="n2035" class="stm mis"><a href="#n2035">2035</a></p>
+<p id="n2036" class="stm mis"><a href="#n2036">2036</a></p>
 <p id="n2037" class="pln"><a href="#n2037">2037</a></p>
-<p id="n2038" class="pln"><a href="#n2038">2038</a></p>
-<p id="n2039" class="pln"><a href="#n2039">2039</a></p>
+<p id="n2038" class="stm mis"><a href="#n2038">2038</a></p>
+<p id="n2039" class="stm mis"><a href="#n2039">2039</a></p>
 <p id="n2040" class="pln"><a href="#n2040">2040</a></p>
-<p id="n2041" class="pln"><a href="#n2041">2041</a></p>
-<p id="n2042" class="pln"><a href="#n2042">2042</a></p>
+<p id="n2041" class="stm mis"><a href="#n2041">2041</a></p>
+<p id="n2042" class="stm mis"><a href="#n2042">2042</a></p>
 <p id="n2043" class="pln"><a href="#n2043">2043</a></p>
-<p id="n2044" class="pln"><a href="#n2044">2044</a></p>
-<p id="n2045" class="pln"><a href="#n2045">2045</a></p>
+<p id="n2044" class="stm mis"><a href="#n2044">2044</a></p>
+<p id="n2045" class="stm mis"><a href="#n2045">2045</a></p>
 <p id="n2046" class="pln"><a href="#n2046">2046</a></p>
-<p id="n2047" class="pln"><a href="#n2047">2047</a></p>
-<p id="n2048" class="pln"><a href="#n2048">2048</a></p>
+<p id="n2047" class="stm mis"><a href="#n2047">2047</a></p>
+<p id="n2048" class="stm mis"><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="n2050" class="stm mis"><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="n2053" class="pln"><a href="#n2053">2053</a></p>
+<p id="n2052" class="pln"><a href="#n2052">2052</a></p>
+<p id="n2053" class="stm mis"><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="n2055" class="stm run hide_run"><a href="#n2055">2055</a></p>
+<p id="n2056" class="stm mis"><a href="#n2056">2056</a></p>
 <p id="n2057" class="stm mis"><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="n2058" class="stm mis"><a href="#n2058">2058</a></p>
+<p id="n2059" class="stm mis"><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="n2062" class="pln"><a href="#n2062">2062</a></p>
+<p id="n2061" class="pln"><a href="#n2061">2061</a></p>
+<p id="n2062" class="stm run hide_run"><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>
-<p id="n2065" class="pln"><a href="#n2065">2065</a></p>
+<p id="n2064" class="stm run hide_run"><a href="#n2064">2064</a></p>
+<p id="n2065" class="stm mis"><a href="#n2065">2065</a></p>
 <p id="n2066" class="pln"><a href="#n2066">2066</a></p>
 <p id="n2067" class="pln"><a href="#n2067">2067</a></p>
 <p id="n2068" class="pln"><a href="#n2068">2068</a></p>
@@ -2146,21 +2146,21 @@
 <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="pln"><a href="#n2078">2078</a></p>
+<p id="n2079" class="pln"><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="n2082" class="stm mis"><a href="#n2082">2082</a></p>
+<p id="n2083" class="stm mis"><a href="#n2083">2083</a></p>
+<p id="n2084" class="pln"><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="n2088" class="pln"><a href="#n2088">2088</a></p>
+<p id="n2086" class="pln"><a href="#n2086">2086</a></p>
+<p id="n2087" class="pln"><a href="#n2087">2087</a></p>
+<p id="n2088" class="stm mis"><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>
+<p id="n2090" class="stm run hide_run"><a href="#n2090">2090</a></p>
 <p id="n2091" class="pln"><a href="#n2091">2091</a></p>
-<p id="n2092" class="pln"><a href="#n2092">2092</a></p>
+<p id="n2092" class="stm mis"><a href="#n2092">2092</a></p>
 <p id="n2093" class="pln"><a href="#n2093">2093</a></p>
 <p id="n2094" class="pln"><a href="#n2094">2094</a></p>
 <p id="n2095" class="pln"><a href="#n2095">2095</a></p>
@@ -2172,20 +2172,20 @@
 <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="pln"><a href="#n2104">2104</a></p>
+<p id="n2105" class="pln"><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="n2109" class="stm mis"><a href="#n2109">2109</a></p>
 <p id="n2110" class="stm mis"><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>
+<p id="n2113" class="pln"><a href="#n2113">2113</a></p>
 <p id="n2114" class="pln"><a href="#n2114">2114</a></p>
-<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="n2115" class="stm mis"><a href="#n2115">2115</a></p>
+<p id="n2116" class="pln"><a href="#n2116">2116</a></p>
+<p id="n2117" class="stm run hide_run"><a href="#n2117">2117</a></p>
 <p id="n2118" class="stm mis"><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>
@@ -2203,30 +2203,30 @@
 <p id="n2132" class="pln"><a href="#n2132">2132</a></p>
 <p id="n2133" class="pln"><a href="#n2133">2133</a></p>
 <p id="n2134" class="pln"><a href="#n2134">2134</a></p>
-<p id="n2135" class="pln"><a href="#n2135">2135</a></p>
-<p id="n2136" class="pln"><a href="#n2136">2136</a></p>
+<p id="n2135" class="stm mis"><a href="#n2135">2135</a></p>
+<p id="n2136" class="stm mis"><a href="#n2136">2136</a></p>
 <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="n2140" class="pln"><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="n2142" class="pln"><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="pln"><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="n2147" class="stm run hide_run"><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="n2149" class="stm mis"><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="pln"><a href="#n2151">2151</a></p>
+<p id="n2152" class="pln"><a href="#n2152">2152</a></p>
+<p id="n2153" class="pln"><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="n2155" class="pln"><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="pln"><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>
@@ -2239,25 +2239,25 @@
 <p id="n2168" class="pln"><a href="#n2168">2168</a></p>
 <p id="n2169" class="pln"><a href="#n2169">2169</a></p>
 <p id="n2170" class="pln"><a href="#n2170">2170</a></p>
-<p id="n2171" class="pln"><a href="#n2171">2171</a></p>
-<p id="n2172" class="pln"><a href="#n2172">2172</a></p>
-<p id="n2173" class="pln"><a href="#n2173">2173</a></p>
+<p id="n2171" class="stm mis"><a href="#n2171">2171</a></p>
+<p id="n2172" class="stm mis"><a href="#n2172">2172</a></p>
+<p id="n2173" class="stm mis"><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="n2175" class="stm run hide_run"><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="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="n2177" class="pln"><a href="#n2177">2177</a></p>
+<p id="n2178" class="pln"><a href="#n2178">2178</a></p>
+<p id="n2179" class="pln"><a href="#n2179">2179</a></p>
+<p id="n2180" class="pln"><a href="#n2180">2180</a></p>
+<p id="n2181" class="pln"><a href="#n2181">2181</a></p>
+<p id="n2182" class="stm mis"><a href="#n2182">2182</a></p>
+<p id="n2183" class="stm mis"><a href="#n2183">2183</a></p>
+<p id="n2184" class="stm mis"><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="n2189" class="pln"><a href="#n2189">2189</a></p>
+<p id="n2188" class="pln"><a href="#n2188">2188</a></p>
+<p id="n2189" class="stm mis"><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>
 <p id="n2192" class="pln"><a href="#n2192">2192</a></p>
@@ -2265,32 +2265,63 @@
 <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="pln"><a href="#n2197">2197</a></p>
+<p id="n2198" class="pln"><a href="#n2198">2198</a></p>
+<p id="n2199" class="pln"><a href="#n2199">2199</a></p>
+<p id="n2200" class="pln"><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="n2202" class="pln"><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="pln"><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>
-<p id="n2208" class="pln"><a href="#n2208">2208</a></p>
-<p id="n2209" class="pln"><a href="#n2209">2209</a></p>
-<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="n2219" class="pln"><a href="#n2219">2219</a></p>
+<p id="n2207" class="stm mis"><a href="#n2207">2207</a></p>
+<p id="n2208" class="stm mis"><a href="#n2208">2208</a></p>
+<p id="n2209" class="stm mis"><a href="#n2209">2209</a></p>
+<p id="n2210" class="stm mis"><a href="#n2210">2210</a></p>
+<p id="n2211" class="stm mis"><a href="#n2211">2211</a></p>
+<p id="n2212" class="stm mis"><a href="#n2212">2212</a></p>
+<p id="n2213" class="pln"><a href="#n2213">2213</a></p>
+<p id="n2214" class="pln"><a href="#n2214">2214</a></p>
+<p id="n2215" class="stm run hide_run"><a href="#n2215">2215</a></p>
+<p id="n2216" class="pln"><a href="#n2216">2216</a></p>
+<p id="n2217" class="stm run hide_run"><a href="#n2217">2217</a></p>
+<p id="n2218" class="pln"><a href="#n2218">2218</a></p>
+<p id="n2219" class="stm mis"><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>
+<p id="n2223" class="pln"><a href="#n2223">2223</a></p>
+<p id="n2224" class="pln"><a href="#n2224">2224</a></p>
+<p id="n2225" class="pln"><a href="#n2225">2225</a></p>
+<p id="n2226" class="pln"><a href="#n2226">2226</a></p>
+<p id="n2227" class="pln"><a href="#n2227">2227</a></p>
+<p id="n2228" class="stm mis"><a href="#n2228">2228</a></p>
+<p id="n2229" class="stm mis"><a href="#n2229">2229</a></p>
+<p id="n2230" class="stm mis"><a href="#n2230">2230</a></p>
+<p id="n2231" class="stm mis"><a href="#n2231">2231</a></p>
+<p id="n2232" class="pln"><a href="#n2232">2232</a></p>
+<p id="n2233" class="stm run hide_run"><a href="#n2233">2233</a></p>
+<p id="n2234" class="pln"><a href="#n2234">2234</a></p>
+<p id="n2235" class="stm mis"><a href="#n2235">2235</a></p>
+<p id="n2236" class="pln"><a href="#n2236">2236</a></p>
+<p id="n2237" class="pln"><a href="#n2237">2237</a></p>
+<p id="n2238" class="pln"><a href="#n2238">2238</a></p>
+<p id="n2239" class="pln"><a href="#n2239">2239</a></p>
+<p id="n2240" class="pln"><a href="#n2240">2240</a></p>
+<p id="n2241" class="pln"><a href="#n2241">2241</a></p>
+<p id="n2242" class="pln"><a href="#n2242">2242</a></p>
+<p id="n2243" class="pln"><a href="#n2243">2243</a></p>
+<p id="n2244" class="stm mis"><a href="#n2244">2244</a></p>
+<p id="n2245" class="stm mis"><a href="#n2245">2245</a></p>
+<p id="n2246" class="stm mis"><a href="#n2246">2246</a></p>
+<p id="n2247" class="stm mis"><a href="#n2247">2247</a></p>
+<p id="n2248" class="stm mis"><a href="#n2248">2248</a></p>
+<p id="n2249" class="stm mis"><a href="#n2249">2249</a></p>
+<p id="n2250" class="pln"><a href="#n2250">2250</a></p>
+<p id="n2251" class="pln"><a href="#n2251">2251</a></p>
+<p id="n2252" class="pln"><a href="#n2252">2252</a></p>
+<p id="n2253" class="pln"><a href="#n2253">2253</a></p>
 
             </td>
             <td class="text">
@@ -3514,730 +3545,730 @@
 <p id="t1218" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
 <p id="t1219" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1220" class="pln"><span class="str">                cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut">&nbsp;</span></p>
-<p id="t1221" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1222" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1223" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1224" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1226" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t1227" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1228" class="pln"><span class="str">                cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut">&nbsp;</span></p>
-<p id="t1229" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1230" class="pln"><span class="str">                // Unicode: \xe1\x88\xb4 (U+1234)</span><span class="strut">&nbsp;</span></p>
-<p id="t1231" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1232" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1233" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1234" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1240" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1242" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1244" class="pln"><span class="str">                // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut">&nbsp;</span></p>
-<p id="t1245" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1247" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1248" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1249" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1250" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1252" class="pln"><span class="str">                // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut">&nbsp;</span></p>
-<p id="t1253" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1255" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1257" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1258" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1259" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1260" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1266" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1267" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1269" class="pln">    <span class="str">""" When running tests which import modules, the sys.modules list</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1272" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</span></p>
-<p id="t1273" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1277" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1279" class="stm mis">        <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut">&nbsp;</span></p>
-<p id="t1280" class="pln">            <span class="nam">modname</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1283" class="pln">            <span class="op">]</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1287" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1288" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1291" class="pln">        <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1292" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1293" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1294" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1295" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1296" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1221" class="pln"><span class="str">                cog.outl(u"// ascii.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1222" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1223" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1224" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1225" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1226" 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">&nbsp;</span></p>
+<p id="t1227" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t1228" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1229" class="pln"><span class="str">                cog.outl("// Unicode: \xe1\x88\xb4 (U+1234)")</span><span class="strut">&nbsp;</span></p>
+<p id="t1230" class="pln"><span class="str">                cog.outl(u"// ascii.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1231" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1232" class="pln"><span class="str">                // Unicode: \xe1\x88\xb4 (U+1234)</span><span class="strut">&nbsp;</span></p>
+<p id="t1233" class="pln"><span class="str">                // ascii.</span><span class="strut">&nbsp;</span></p>
+<p id="t1234" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1235" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1236" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1237" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1238" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1239" 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">&nbsp;</span></p>
+<p id="t1240" 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">&nbsp;</span></p>
+<p id="t1241" 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">&nbsp;</span></p>
+<p id="t1242" 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">&nbsp;</span></p>
+<p id="t1243" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1244" class="stm run hide_run">    <span class="key">def</span> <span class="nam">testUnicode</span><span class="op">(</span><span class="nam">self</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t1245" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1246" 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">&nbsp;</span></p>
+<p id="t1247" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t1248" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1249" class="pln"><span class="str">                cog.outl(u"// Unicode: \u1234 (U+1234)")</span><span class="strut">&nbsp;</span></p>
+<p id="t1250" class="pln"><span class="str">                cog.outl(u"// Unicode: \u1234 (U+1234)")</span><span class="strut">&nbsp;</span></p>
+<p id="t1251" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1252" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1253" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1254" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1255" 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">&nbsp;</span></p>
+<p id="t1256" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t1257" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1258" class="pln"><span class="str">                cog.outl(u"// Unicode: \u1234 (U+1234)")</span><span class="strut">&nbsp;</span></p>
+<p id="t1259" class="pln"><span class="str">                cog.outl(u"// Unicode: \u1234 (U+1234)")</span><span class="strut">&nbsp;</span></p>
+<p id="t1260" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1261" class="pln"><span class="str">                // Unicode: \xe1\x88\xb4 (U+1234)</span><span class="strut">&nbsp;</span></p>
+<p id="t1262" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1263" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1264" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1265" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1266" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1267" 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">&nbsp;</span></p>
+<p id="t1268" 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">&nbsp;</span></p>
+<p id="t1269" 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">&nbsp;</span></p>
+<p id="t1270" 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">&nbsp;</span></p>
+<p id="t1271" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1272" 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">&nbsp;</span></p>
+<p id="t1273" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1274" 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">&nbsp;</span></p>
+<p id="t1275" class="pln"><span class="str">                // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut">&nbsp;</span></p>
+<p id="t1276" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1277" 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">&nbsp;</span></p>
+<p id="t1278" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1279" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1280" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1281" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1282" 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">&nbsp;</span></p>
+<p id="t1283" class="pln"><span class="str">                // \xca\xee\xe4\xe8\xf0\xe2\xea\xe0 Windows</span><span class="strut">&nbsp;</span></p>
+<p id="t1284" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1285" 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">&nbsp;</span></p>
+<p id="t1286" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1287" 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">&nbsp;</span></p>
+<p id="t1288" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1289" class="pln"><span class="str">                """</span><span class="op">)</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1290" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1291" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1292" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1293" 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">&nbsp;</span></p>
+<p id="t1294" 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">&nbsp;</span></p>
+<p id="t1295" 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">&nbsp;</span></p>
+<p id="t1296" 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">&nbsp;</span></p>
 <p id="t1297" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1298" class="pln">        <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1299" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1300" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1301" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1302" class="pln"><span class="str">            Hello from mymodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1303" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1304" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1305" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1306" class="pln">        <span class="str">'test2.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1307" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1308" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1309" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1310" class="pln"><span class="str">            Hello from mymodule in inc2</span><span class="strut">&nbsp;</span></p>
-<p id="t1311" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1312" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1313" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1314" class="pln">        <span class="str">'include'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1315" class="pln">            <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1316" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1317" class="pln"><span class="str">                cog.outl("Hello from mymodule")</span><span class="strut">&nbsp;</span></p>
-<p id="t1318" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t1319" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1320" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1321" class="pln">        <span class="str">'inc2'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1322" class="pln">            <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1323" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1324" class="pln"><span class="str">                cog.outl("Hello from mymodule in inc2")</span><span class="strut">&nbsp;</span></p>
-<p id="t1325" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t1326" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1327" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1328" class="pln">        <span class="str">'inc3'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1329" class="pln">            <span class="str">'someothermodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1330" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1331" class="pln"><span class="str">                cog.outl("This is some other module.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1332" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t1333" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1334" class="pln">        <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1335" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1341" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1343" class="pln">        <span class="com"># Test that -I adds include directories properly.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1347" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1349" class="pln">        <span class="com"># Test that two -I's add include directories properly.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1353" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1355" class="pln">        <span class="com"># Test that two -I's add include directories properly.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1359" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1361" class="pln">        <span class="com"># Test that the search will continue past the first directory.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1365" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1367" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1368" class="pln">            <span class="str">'bad.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1369" class="pln"><span class="str">                //[[[cog cog.error("Oh no!") ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1370" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1371" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1372" class="pln">            <span class="str">'good.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1373" class="pln"><span class="str">                //[[[cog cog.outl("Oh yes!") ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1374" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1375" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1376" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1377" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1379" class="pln">        <span class="com"># Is it unchanged just by creating a cog engine?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1383" class="pln">        <span class="com"># Is it unchanged for a successful run?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1387" class="pln">        <span class="com"># Is it unchanged for a successful run with includes?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1391" class="pln">        <span class="com"># Is it unchanged for a successful run with two includes?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1395" class="pln">        <span class="com"># Is it unchanged for a failed run?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1400" class="pln">        <span class="com"># Is it unchanged for a failed run with includes?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1405" class="pln">        <span class="com"># Is it unchanged for a failed run with two includes?</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1410" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1413" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1414" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1415" class="pln">            <span class="str">'code'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1416" class="pln">                <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1417" class="pln"><span class="str">                    //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1418" class="pln"><span class="str">                        import mysubmodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1419" class="pln"><span class="str">                    //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1420" class="pln"><span class="str">                    //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1421" class="pln"><span class="str">                    """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1422" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1423" class="pln">                <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1424" class="pln"><span class="str">                    //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1425" class="pln"><span class="str">                        import mysubmodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1426" class="pln"><span class="str">                    //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1427" class="pln"><span class="str">                    Hello from mysubmodule</span><span class="strut">&nbsp;</span></p>
-<p id="t1428" class="pln"><span class="str">                    //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1429" class="pln"><span class="str">                    """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1430" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1431" class="pln">                <span class="str">'mysubmodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1432" class="pln"><span class="str">                    import cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1433" class="pln"><span class="str">                    cog.outl("Hello from mysubmodule")</span><span class="strut">&nbsp;</span></p>
-<p id="t1434" class="pln"><span class="str">                    """</span><span class="strut">&nbsp;</span></p>
-<p id="t1435" class="pln">                <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1436" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1437" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1440" class="pln">        <span class="com"># auto-include the current directory</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1443" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1298" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1299" 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">&nbsp;</span></p>
+<p id="t1300" class="pln">    <span class="str">""" When running tests which import modules, the sys.modules list</span><span class="strut">&nbsp;</span></p>
+<p id="t1301" class="pln"><span class="str">        leaks from one test to the next.  This test case class scrubs</span><span class="strut">&nbsp;</span></p>
+<p id="t1302" class="pln"><span class="str">        the list after each run to keep the tests isolated from each other.</span><span class="strut">&nbsp;</span></p>
+<p id="t1303" class="pln"><span class="str">    """</span><span class="strut">&nbsp;</span></p>
+<p id="t1304" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1305" 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">&nbsp;</span></p>
+<p id="t1306" 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">&nbsp;</span></p>
+<p id="t1307" 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">&nbsp;</span></p>
+<p id="t1308" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1309" 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">&nbsp;</span></p>
+<p id="t1310" class="stm mis">        <span class="nam">modstoscrub</span> <span class="op">=</span> <span class="op">[</span><span class="strut">&nbsp;</span></p>
+<p id="t1311" class="pln">            <span class="nam">modname</span><span class="strut">&nbsp;</span></p>
+<p id="t1312" 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">&nbsp;</span></p>
+<p id="t1313" 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">&nbsp;</span></p>
+<p id="t1314" class="pln">            <span class="op">]</span><span class="strut">&nbsp;</span></p>
+<p id="t1315" 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">&nbsp;</span></p>
+<p id="t1316" 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">&nbsp;</span></p>
+<p id="t1317" 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">&nbsp;</span></p>
+<p id="t1318" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1319" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1320" 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">&nbsp;</span></p>
+<p id="t1321" class="stm run hide_run">    <span class="nam">dincludes</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1322" class="pln">        <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1323" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1324" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1325" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1326" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1327" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1328" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1329" class="pln">        <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1330" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1331" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1332" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1333" class="pln"><span class="str">            Hello from mymodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1334" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1335" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1336" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1337" class="pln">        <span class="str">'test2.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1338" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1339" class="pln"><span class="str">                import mymodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1340" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1341" class="pln"><span class="str">            Hello from mymodule in inc2</span><span class="strut">&nbsp;</span></p>
+<p id="t1342" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1343" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1344" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1345" class="pln">        <span class="str">'include'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1346" class="pln">            <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1347" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1348" class="pln"><span class="str">                cog.outl("Hello from mymodule")</span><span class="strut">&nbsp;</span></p>
+<p id="t1349" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t1350" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1351" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1352" class="pln">        <span class="str">'inc2'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1353" class="pln">            <span class="str">'mymodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1354" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1355" class="pln"><span class="str">                cog.outl("Hello from mymodule in inc2")</span><span class="strut">&nbsp;</span></p>
+<p id="t1356" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t1357" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1358" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1359" class="pln">        <span class="str">'inc3'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1360" class="pln">            <span class="str">'someothermodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1361" class="pln"><span class="str">                import cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1362" class="pln"><span class="str">                cog.outl("This is some other module.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1363" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t1364" class="pln">            <span class="op">}</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1365" class="pln">        <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1366" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1367" 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">&nbsp;</span></p>
+<p id="t1368" class="pln">        <span class="com"># Try it without the -I, to see that an ImportError happens.</span><span class="strut">&nbsp;</span></p>
+<p id="t1369" 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">&nbsp;</span></p>
+<p id="t1370" 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">&nbsp;</span></p>
+<p id="t1371" 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">&nbsp;</span></p>
+<p id="t1372" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1373" 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">&nbsp;</span></p>
+<p id="t1374" class="pln">        <span class="com"># Test that -I adds include directories properly.</span><span class="strut">&nbsp;</span></p>
+<p id="t1375" 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">&nbsp;</span></p>
+<p id="t1376" 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">&nbsp;</span></p>
+<p id="t1377" 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">&nbsp;</span></p>
+<p id="t1378" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1379" 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">&nbsp;</span></p>
+<p id="t1380" class="pln">        <span class="com"># Test that two -I's add include directories properly.</span><span class="strut">&nbsp;</span></p>
+<p id="t1381" 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">&nbsp;</span></p>
+<p id="t1382" 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">&nbsp;</span></p>
+<p id="t1383" 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">&nbsp;</span></p>
+<p id="t1384" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1385" 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">&nbsp;</span></p>
+<p id="t1386" class="pln">        <span class="com"># Test that two -I's add include directories properly.</span><span class="strut">&nbsp;</span></p>
+<p id="t1387" 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">&nbsp;</span></p>
+<p id="t1388" 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">&nbsp;</span></p>
+<p id="t1389" 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">&nbsp;</span></p>
+<p id="t1390" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1391" 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">&nbsp;</span></p>
+<p id="t1392" class="pln">        <span class="com"># Test that the search will continue past the first directory.</span><span class="strut">&nbsp;</span></p>
+<p id="t1393" 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">&nbsp;</span></p>
+<p id="t1394" 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">&nbsp;</span></p>
+<p id="t1395" 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">&nbsp;</span></p>
+<p id="t1396" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1397" 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">&nbsp;</span></p>
+<p id="t1398" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1399" class="pln">            <span class="str">'bad.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1400" class="pln"><span class="str">                //[[[cog cog.error("Oh no!") ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1401" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1402" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1403" class="pln">            <span class="str">'good.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1404" class="pln"><span class="str">                //[[[cog cog.outl("Oh yes!") ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1405" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1406" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1407" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1408" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1409" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1410" class="pln">        <span class="com"># Is it unchanged just by creating a cog engine?</span><span class="strut">&nbsp;</span></p>
+<p id="t1411" 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">&nbsp;</span></p>
+<p id="t1412" 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">&nbsp;</span></p>
+<p id="t1413" 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">&nbsp;</span></p>
+<p id="t1414" class="pln">        <span class="com"># Is it unchanged for a successful run?</span><span class="strut">&nbsp;</span></p>
+<p id="t1415" 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">&nbsp;</span></p>
+<p id="t1416" 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">&nbsp;</span></p>
+<p id="t1417" 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">&nbsp;</span></p>
+<p id="t1418" class="pln">        <span class="com"># Is it unchanged for a successful run with includes?</span><span class="strut">&nbsp;</span></p>
+<p id="t1419" 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">&nbsp;</span></p>
+<p id="t1420" 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">&nbsp;</span></p>
+<p id="t1421" 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">&nbsp;</span></p>
+<p id="t1422" class="pln">        <span class="com"># Is it unchanged for a successful run with two includes?</span><span class="strut">&nbsp;</span></p>
+<p id="t1423" 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">&nbsp;</span></p>
+<p id="t1424" 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">&nbsp;</span></p>
+<p id="t1425" 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">&nbsp;</span></p>
+<p id="t1426" class="pln">        <span class="com"># Is it unchanged for a failed run?</span><span class="strut">&nbsp;</span></p>
+<p id="t1427" 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">&nbsp;</span></p>
+<p id="t1428" 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">&nbsp;</span></p>
+<p id="t1429" 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">&nbsp;</span></p>
+<p id="t1430" 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">&nbsp;</span></p>
+<p id="t1431" class="pln">        <span class="com"># Is it unchanged for a failed run with includes?</span><span class="strut">&nbsp;</span></p>
+<p id="t1432" 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">&nbsp;</span></p>
+<p id="t1433" 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">&nbsp;</span></p>
+<p id="t1434" 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">&nbsp;</span></p>
+<p id="t1435" 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">&nbsp;</span></p>
+<p id="t1436" class="pln">        <span class="com"># Is it unchanged for a failed run with two includes?</span><span class="strut">&nbsp;</span></p>
+<p id="t1437" 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">&nbsp;</span></p>
+<p id="t1438" 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">&nbsp;</span></p>
+<p id="t1439" 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">&nbsp;</span></p>
+<p id="t1440" 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">&nbsp;</span></p>
+<p id="t1441" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1442" 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">&nbsp;</span></p>
+<p id="t1443" class="pln">        <span class="com"># Test that relative paths on the command line work, with includes.</span><span class="strut">&nbsp;</span></p>
 <p id="t1444" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1446" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1449" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1450" class="pln">            <span class="str">'with.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1451" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1452" class="pln"><span class="str">                cog.outl("hello world")</span><span class="strut">&nbsp;</span></p>
-<p id="t1453" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1454" class="pln"><span class="str">                hello world</span><span class="strut">&nbsp;</span></p>
-<p id="t1455" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1456" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1457" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1458" class="pln">            <span class="str">'without.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1459" class="pln"><span class="str">                There's no cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1460" class="pln"><span class="str">                code in this file.</span><span class="strut">&nbsp;</span></p>
-<p id="t1461" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1462" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1463" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1476" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1478" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1479" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1480" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1482" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1483" class="pln"><span class="str">                this is cog1.txt in, cog1.txt out</span><span class="strut">&nbsp;</span></p>
-<p id="t1484" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1485" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1486" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1487" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1488" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1490" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1491" class="pln"><span class="str">                This is cog1.txt in, cog1.txt out</span><span class="strut">&nbsp;</span></p>
-<p id="t1492" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1493" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1445" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1446" class="pln">            <span class="str">'code'</span><span class="op">:</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1447" class="pln">                <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1448" class="pln"><span class="str">                    //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1449" class="pln"><span class="str">                        import mysubmodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1450" class="pln"><span class="str">                    //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1451" class="pln"><span class="str">                    //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1452" class="pln"><span class="str">                    """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1453" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1454" class="pln">                <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1455" class="pln"><span class="str">                    //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1456" class="pln"><span class="str">                        import mysubmodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1457" class="pln"><span class="str">                    //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1458" class="pln"><span class="str">                    Hello from mysubmodule</span><span class="strut">&nbsp;</span></p>
+<p id="t1459" class="pln"><span class="str">                    //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1460" class="pln"><span class="str">                    """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1461" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1462" class="pln">                <span class="str">'mysubmodule.py'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1463" class="pln"><span class="str">                    import cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1464" class="pln"><span class="str">                    cog.outl("Hello from mysubmodule")</span><span class="strut">&nbsp;</span></p>
+<p id="t1465" class="pln"><span class="str">                    """</span><span class="strut">&nbsp;</span></p>
+<p id="t1466" class="pln">                <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1467" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1468" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1469" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1470" class="pln">        <span class="com"># We should be able to invoke cog without the -I switch, and it will</span><span class="strut">&nbsp;</span></p>
+<p id="t1471" class="pln">        <span class="com"># auto-include the current directory</span><span class="strut">&nbsp;</span></p>
+<p id="t1472" 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">&nbsp;</span></p>
+<p id="t1473" 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">&nbsp;</span></p>
+<p id="t1474" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1475" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1476" 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">&nbsp;</span></p>
+<p id="t1477" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1478" 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">&nbsp;</span></p>
+<p id="t1479" class="pln">        <span class="com"># Test that the -e switch warns if there is no Cog code.</span><span class="strut">&nbsp;</span></p>
+<p id="t1480" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1481" class="pln">            <span class="str">'with.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1482" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1483" class="pln"><span class="str">                cog.outl("hello world")</span><span class="strut">&nbsp;</span></p>
+<p id="t1484" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1485" class="pln"><span class="str">                hello world</span><span class="strut">&nbsp;</span></p>
+<p id="t1486" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1487" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1488" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1489" class="pln">            <span class="str">'without.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1490" class="pln"><span class="str">                There's no cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1491" class="pln"><span class="str">                code in this file.</span><span class="strut">&nbsp;</span></p>
+<p id="t1492" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1493" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
 <p id="t1494" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1495" class="pln">            <span class="str">'cog1out.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1496" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1498" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1499" class="pln"><span class="str">                This is cog1.txt in, cog1out.txt out</span><span class="strut">&nbsp;</span></p>
-<p id="t1500" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1501" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1502" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1503" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1510" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1513" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1514" class="pln">            <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1515" class="pln"><span class="str">                //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1516" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1517" class="pln"><span class="str">                //[[[cog cog.outl(s) ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1518" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1519" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1520" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1521" class="pln">            <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1522" class="pln"><span class="str">                //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1523" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1524" class="pln"><span class="str">                //[[[cog cog.outl(s) ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1525" class="pln"><span class="str">                This was set in one.cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1526" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1527" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1528" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1529" class="pln">            <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1530" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1531" class="pln"><span class="str">                try:</span><span class="strut">&nbsp;</span></p>
-<p id="t1532" class="pln"><span class="str">                    cog.outl(s)</span><span class="strut">&nbsp;</span></p>
-<p id="t1533" class="pln"><span class="str">                except NameError:</span><span class="strut">&nbsp;</span></p>
-<p id="t1534" class="pln"><span class="str">                    cog.outl("s isn't set!")</span><span class="strut">&nbsp;</span></p>
-<p id="t1535" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1536" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1537" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1538" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1539" class="pln">            <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1540" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1541" class="pln"><span class="str">                try:</span><span class="strut">&nbsp;</span></p>
-<p id="t1542" class="pln"><span class="str">                    cog.outl(s)</span><span class="strut">&nbsp;</span></p>
-<p id="t1543" class="pln"><span class="str">                except NameError:</span><span class="strut">&nbsp;</span></p>
-<p id="t1544" class="pln"><span class="str">                    cog.outl("s isn't set!")</span><span class="strut">&nbsp;</span></p>
-<p id="t1545" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1546" class="pln"><span class="str">                s isn't set!</span><span class="strut">&nbsp;</span></p>
+<p id="t1495" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1496" 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">&nbsp;</span></p>
+<p id="t1497" 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">&nbsp;</span></p>
+<p id="t1498" 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">&nbsp;</span></p>
+<p id="t1499" 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">&nbsp;</span></p>
+<p id="t1500" 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">&nbsp;</span></p>
+<p id="t1501" 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">&nbsp;</span></p>
+<p id="t1502" 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">&nbsp;</span></p>
+<p id="t1503" 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">&nbsp;</span></p>
+<p id="t1504" 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">&nbsp;</span></p>
+<p id="t1505" 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">&nbsp;</span></p>
+<p id="t1506" 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">&nbsp;</span></p>
+<p id="t1507" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1508" 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">&nbsp;</span></p>
+<p id="t1509" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1510" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1511" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1512" class="pln"><span class="str">                cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut">&nbsp;</span></p>
+<p id="t1513" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1514" class="pln"><span class="str">                this is cog1.txt in, cog1.txt out</span><span class="strut">&nbsp;</span></p>
+<p id="t1515" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1516" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1517" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1518" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1519" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1520" class="pln"><span class="str">                cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut">&nbsp;</span></p>
+<p id="t1521" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1522" class="pln"><span class="str">                This is cog1.txt in, cog1.txt out</span><span class="strut">&nbsp;</span></p>
+<p id="t1523" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1524" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1525" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1526" class="pln">            <span class="str">'cog1out.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1527" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1528" class="pln"><span class="str">                cog.outl("This is %s in, %s out" % (cog.inFile, cog.outFile))</span><span class="strut">&nbsp;</span></p>
+<p id="t1529" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1530" class="pln"><span class="str">                This is cog1.txt in, cog1out.txt out</span><span class="strut">&nbsp;</span></p>
+<p id="t1531" class="pln"><span class="str">                [[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1532" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1533" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1534" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1535" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1536" 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">&nbsp;</span></p>
+<p id="t1537" 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">&nbsp;</span></p>
+<p id="t1538" 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">&nbsp;</span></p>
+<p id="t1539" 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">&nbsp;</span></p>
+<p id="t1540" 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">&nbsp;</span></p>
+<p id="t1541" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1542" 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">&nbsp;</span></p>
+<p id="t1543" class="pln">        <span class="com"># Make sure that global values don't get shared between files.</span><span class="strut">&nbsp;</span></p>
+<p id="t1544" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1545" class="pln">            <span class="str">'one.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1546" class="pln"><span class="str">                //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1547" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1548" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1549" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1550" class="pln">            <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1551" class="pln"><span class="str">                # Please run cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1552" class="pln"><span class="str">                one.cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1553" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1554" class="pln"><span class="str">                two.cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1555" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t1556" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1557" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1564" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1566" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1567" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1568" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1569" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1570" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1571" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1572" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1573" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
-<p id="t1574" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1575" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1576" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1577" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1578" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1579" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1580" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1581" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
-<p id="t1582" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1583" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1584" class="pln">            <span class="str">'cog1.out2'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1585" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1586" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1587" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1588" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1589" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1590" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
-<p id="t1591" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1592" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1593" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1595" class="pln">        <span class="com"># Remove generated output.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1599" class="pln">        <span class="com"># Regenerate the generated output.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1603" class="pln">        <span class="com"># Remove the generated output again.</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
+<p id="t1548" class="pln"><span class="str">                //[[[cog cog.outl(s) ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1549" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1550" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1551" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1552" class="pln">            <span class="str">'one.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1553" class="pln"><span class="str">                //[[[cog s = "This was set in one.cog" ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1554" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1555" class="pln"><span class="str">                //[[[cog cog.outl(s) ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1556" class="pln"><span class="str">                This was set in one.cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1557" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1558" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1559" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1560" class="pln">            <span class="str">'two.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1561" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1562" class="pln"><span class="str">                try:</span><span class="strut">&nbsp;</span></p>
+<p id="t1563" class="pln"><span class="str">                    cog.outl(s)</span><span class="strut">&nbsp;</span></p>
+<p id="t1564" class="pln"><span class="str">                except NameError:</span><span class="strut">&nbsp;</span></p>
+<p id="t1565" class="pln"><span class="str">                    cog.outl("s isn't set!")</span><span class="strut">&nbsp;</span></p>
+<p id="t1566" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1567" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1568" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1569" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1570" class="pln">            <span class="str">'two.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1571" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1572" class="pln"><span class="str">                try:</span><span class="strut">&nbsp;</span></p>
+<p id="t1573" class="pln"><span class="str">                    cog.outl(s)</span><span class="strut">&nbsp;</span></p>
+<p id="t1574" class="pln"><span class="str">                except NameError:</span><span class="strut">&nbsp;</span></p>
+<p id="t1575" class="pln"><span class="str">                    cog.outl("s isn't set!")</span><span class="strut">&nbsp;</span></p>
+<p id="t1576" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1577" class="pln"><span class="str">                s isn't set!</span><span class="strut">&nbsp;</span></p>
+<p id="t1578" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1579" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1580" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1581" class="pln">            <span class="str">'cogfiles.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1582" class="pln"><span class="str">                # Please run cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1583" class="pln"><span class="str">                one.cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1584" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1585" class="pln"><span class="str">                two.cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1586" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t1587" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1588" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1589" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1590" 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">&nbsp;</span></p>
+<p id="t1591" 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">&nbsp;</span></p>
+<p id="t1592" 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">&nbsp;</span></p>
+<p id="t1593" 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">&nbsp;</span></p>
+<p id="t1594" 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">&nbsp;</span></p>
+<p id="t1595" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1596" 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">&nbsp;</span></p>
+<p id="t1597" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1598" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1599" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1600" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1601" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1602" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1603" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1604" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
+<p id="t1605" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1606" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1608" class="stm mis">        <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1609" class="pln"><span class="str">            #[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1610" class="pln"><span class="str">                cog.msg("Hello there!")</span><span class="strut">&nbsp;</span></p>
-<p id="t1611" class="pln"><span class="str">            #]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1612" class="pln"><span class="str">            #[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1613" class="pln"><span class="str">            """</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1618" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1621" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1622" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1623" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1624" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1625" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1626" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1627" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1628" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1629" class="pln"><span class="str">                Xhis line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1630" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1631" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1632" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t1633" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1634" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1635" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1642" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1644" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1645" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1646" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1647" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1648" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1607" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1608" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1609" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1610" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1611" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1612" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
+<p id="t1613" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1614" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1615" class="pln">            <span class="str">'cog1.out2'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1616" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1617" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1618" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1619" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1620" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1621" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
+<p id="t1622" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1623" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1624" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1625" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1626" class="pln">        <span class="com"># Remove generated output.</span><span class="strut">&nbsp;</span></p>
+<p id="t1627" 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">&nbsp;</span></p>
+<p id="t1628" 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">&nbsp;</span></p>
+<p id="t1629" 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">&nbsp;</span></p>
+<p id="t1630" class="pln">        <span class="com"># Regenerate the generated output.</span><span class="strut">&nbsp;</span></p>
+<p id="t1631" 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">&nbsp;</span></p>
+<p id="t1632" 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">&nbsp;</span></p>
+<p id="t1633" 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">&nbsp;</span></p>
+<p id="t1634" class="pln">        <span class="com"># Remove the generated output again.</span><span class="strut">&nbsp;</span></p>
+<p id="t1635" 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">&nbsp;</span></p>
+<p id="t1636" 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">&nbsp;</span></p>
+<p id="t1637" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1638" 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">&nbsp;</span></p>
+<p id="t1639" class="stm mis">        <span class="nam">infile</span> <span class="op">=</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1640" class="pln"><span class="str">            #[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1641" class="pln"><span class="str">                cog.msg("Hello there!")</span><span class="strut">&nbsp;</span></p>
+<p id="t1642" class="pln"><span class="str">            #]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1643" class="pln"><span class="str">            #[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1644" class="pln"><span class="str">            """</span><span class="strut">&nbsp;</span></p>
+<p id="t1645" 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">&nbsp;</span></p>
+<p id="t1646" 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">&nbsp;</span></p>
+<p id="t1647" 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">&nbsp;</span></p>
+<p id="t1648" 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">&nbsp;</span></p>
 <p id="t1649" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1650" class="pln">            <span class="str">'test.kablooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1651" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1652" class="pln"><span class="str">                Defined fooey as kablooey</span><span class="strut">&nbsp;</span></p>
-<p id="t1653" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1654" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1655" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1656" class="pln">            <span class="str">'test.einstein'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1657" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1658" class="pln"><span class="str">                Defined fooey as e=mc2</span><span class="strut">&nbsp;</span></p>
-<p id="t1659" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1660" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1661" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1662" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1681" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1683" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1684" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1685" class="pln"><span class="str">                --[[[cog cog.outl('Hey there!') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1686" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1687" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t1688" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1689" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1698" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1705" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1713" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1714" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1716" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1717" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1718" class="pln"><span class="str">                Hey there.</span><span class="strut">&nbsp;</span></p>
-<p id="t1719" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\n   \\nc') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1720" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1721" class="pln"><span class="str">                Good bye.</span><span class="strut">&nbsp;</span></p>
-<p id="t1722" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1723" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1724" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1725" class="pln"><span class="str">                Hey there.</span><span class="strut">&nbsp;</span></p>
-<p id="t1726" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\n   \\nc') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1727" class="pln"><span class="str">                a (foo)</span><span class="strut">&nbsp;</span></p>
-<p id="t1728" class="pln"><span class="str">                b (foo)</span><span class="strut">&nbsp;</span></p>
-<p id="t1729" class="pln"><span class="str">                   """</span>  <span class="com"># These three trailing spaces are important.</span><span class="strut">&nbsp;</span></p>
-<p id="t1730" class="pln">                        <span class="com"># The suffix is not applied to completely blank lines.</span><span class="strut">&nbsp;</span></p>
-<p id="t1731" class="pln">                <span class="str">"""</span><span class="strut">&nbsp;</span></p>
-<p id="t1732" class="pln"><span class="str">                c (foo)</span><span class="strut">&nbsp;</span></p>
-<p id="t1733" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1734" class="pln"><span class="str">                Good bye.</span><span class="strut">&nbsp;</span></p>
-<p id="t1735" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1736" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1737" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1741" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1743" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1744" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1745" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1746" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1747" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1748" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1749" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1750" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1751" class="pln"><span class="str">                a</span><span class="strut">&nbsp;</span></p>
-<p id="t1752" class="pln"><span class="str">                b</span><span class="strut">&nbsp;</span></p>
-<p id="t1753" class="pln"><span class="str">                c</span><span class="strut">&nbsp;</span></p>
-<p id="t1754" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1755" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1756" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1757" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1761" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1763" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1764" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1765" class="pln"><span class="str">                ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1650" 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">&nbsp;</span></p>
+<p id="t1651" class="pln">        <span class="com"># Test that a Cog error is printed to stderr with no traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t1652" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1653" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1654" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1655" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1656" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1657" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1658" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1659" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1660" class="pln"><span class="str">                Xhis line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t1661" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1662" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t1663" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1664" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1665" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1666" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1667" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1668" 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">&nbsp;</span></p>
+<p id="t1669" 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">&nbsp;</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">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">&nbsp;</span></p>
+<p id="t1671" 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">&nbsp;</span></p>
+<p id="t1672" 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">&nbsp;</span></p>
+<p id="t1673" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1674" 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">&nbsp;</span></p>
+<p id="t1675" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1676" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1677" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1678" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1679" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1680" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1681" class="pln">            <span class="str">'test.kablooey'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1682" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1683" class="pln"><span class="str">                Defined fooey as kablooey</span><span class="strut">&nbsp;</span></p>
+<p id="t1684" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1685" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1686" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1687" class="pln">            <span class="str">'test.einstein'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1688" class="pln"><span class="str">                --[[[cog cog.outl("Defined fooey as " + fooey) ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1689" class="pln"><span class="str">                Defined fooey as e=mc2</span><span class="strut">&nbsp;</span></p>
+<p id="t1690" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1691" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1692" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1693" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1694" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1695" 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">&nbsp;</span></p>
+<p id="t1696" 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">&nbsp;</span></p>
+<p id="t1697" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1698" 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">&nbsp;</span></p>
+<p id="t1699" 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">&nbsp;</span></p>
+<p id="t1700" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1701" 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">&nbsp;</span></p>
+<p id="t1702" 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">&nbsp;</span></p>
+<p id="t1703" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1704" 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">&nbsp;</span></p>
+<p id="t1705" 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">&nbsp;</span></p>
+<p id="t1706" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</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">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">&nbsp;</span></p>
+<p id="t1708" 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">&nbsp;</span></p>
+<p id="t1709" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1710" 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">&nbsp;</span></p>
+<p id="t1711" 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">&nbsp;</span></p>
+<p id="t1712" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1713" 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">&nbsp;</span></p>
+<p id="t1714" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1715" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1716" class="pln"><span class="str">                --[[[cog cog.outl('Hey there!') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1717" class="pln"><span class="str">                --[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1718" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t1719" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1720" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1721" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1722" 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">&nbsp;</span></p>
+<p id="t1723" 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">&nbsp;</span></p>
+<p id="t1724" 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">&nbsp;</span></p>
+<p id="t1725" 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">&nbsp;</span></p>
+<p id="t1726" 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">&nbsp;</span></p>
+<p id="t1727" 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">&nbsp;</span></p>
+<p id="t1728" 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">&nbsp;</span></p>
+<p id="t1729" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1730" 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">&nbsp;</span></p>
+<p id="t1731" 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">&nbsp;</span></p>
+<p id="t1732" 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">&nbsp;</span></p>
+<p id="t1733" 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">&nbsp;</span></p>
+<p id="t1734" 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">&nbsp;</span></p>
+<p id="t1735" 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">&nbsp;</span></p>
+<p id="t1736" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1737" 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">&nbsp;</span></p>
+<p id="t1738" 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">&nbsp;</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">'-'</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1740" 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">&nbsp;</span></p>
+<p id="t1741" 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">&nbsp;</span></p>
+<p id="t1742" 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">&nbsp;</span></p>
+<p id="t1743" 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">&nbsp;</span></p>
+<p id="t1744" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1745" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1746" 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">&nbsp;</span></p>
+<p id="t1747" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1748" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1749" class="pln"><span class="str">                Hey there.</span><span class="strut">&nbsp;</span></p>
+<p id="t1750" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\n   \\nc') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1751" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1752" class="pln"><span class="str">                Good bye.</span><span class="strut">&nbsp;</span></p>
+<p id="t1753" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1754" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1755" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1756" class="pln"><span class="str">                Hey there.</span><span class="strut">&nbsp;</span></p>
+<p id="t1757" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\n   \\nc') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1758" class="pln"><span class="str">                a (foo)</span><span class="strut">&nbsp;</span></p>
+<p id="t1759" class="pln"><span class="str">                b (foo)</span><span class="strut">&nbsp;</span></p>
+<p id="t1760" class="pln"><span class="str">                   """</span>  <span class="com"># These three trailing spaces are important.</span><span class="strut">&nbsp;</span></p>
+<p id="t1761" class="pln">                        <span class="com"># The suffix is not applied to completely blank lines.</span><span class="strut">&nbsp;</span></p>
+<p id="t1762" class="pln">                <span class="str">"""</span><span class="strut">&nbsp;</span></p>
+<p id="t1763" class="pln"><span class="str">                c (foo)</span><span class="strut">&nbsp;</span></p>
+<p id="t1764" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1765" class="pln"><span class="str">                Good bye.</span><span class="strut">&nbsp;</span></p>
 <p id="t1766" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1767" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1768" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1769" class="pln"><span class="str">                ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1770" class="pln"><span class="str">                a /\\n*+([)]>&lt;</span><span class="strut">&nbsp;</span></p>
-<p id="t1771" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1772" class="pln"><span class="str">                b /\\n*+([)]>&lt;</span><span class="strut">&nbsp;</span></p>
-<p id="t1773" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1774" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1775" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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*+([)]>&lt;'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t1767" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1768" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1769" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1770" 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">&nbsp;</span></p>
+<p id="t1771" 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">&nbsp;</span></p>
+<p id="t1772" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1773" 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">&nbsp;</span></p>
+<p id="t1774" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1775" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1776" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1777" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1778" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1779" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1780" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1782" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1784" class="pln">        <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1785" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1786" class="pln"><span class="str">            for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut">&nbsp;</span></p>
-<p id="t1787" class="pln"><span class="str">                cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
-<p id="t1788" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1789" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1790" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1791" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1792" class="pln">        <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1793" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1794" class="pln"><span class="str">            for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut">&nbsp;</span></p>
-<p id="t1795" class="pln"><span class="str">                cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
-<p id="t1796" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1797" class="pln"><span class="str">            void DoSomething();</span><span class="strut">&nbsp;</span></p>
-<p id="t1798" class="pln"><span class="str">            void DoAnotherThing();</span><span class="strut">&nbsp;</span></p>
-<p id="t1799" class="pln"><span class="str">            void DoLastThing();</span><span class="strut">&nbsp;</span></p>
-<p id="t1800" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1801" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1802" class="pln">        <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1803" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1805" class="pln">        <span class="com"># for Windows</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1809" class="pln">        <span class="com"># for unix-like</span><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1812" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1819" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1823" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1828" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1833" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1838" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
+<p id="t1780" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1781" class="pln"><span class="str">                ;[[[cog cog.outl('a\\nb\\nc') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1782" class="pln"><span class="str">                a</span><span class="strut">&nbsp;</span></p>
+<p id="t1783" class="pln"><span class="str">                b</span><span class="strut">&nbsp;</span></p>
+<p id="t1784" class="pln"><span class="str">                c</span><span class="strut">&nbsp;</span></p>
+<p id="t1785" class="pln"><span class="str">                ;[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1786" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1787" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1788" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1789" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1790" 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">&nbsp;</span></p>
+<p id="t1791" 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">&nbsp;</span></p>
+<p id="t1792" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1793" 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">&nbsp;</span></p>
+<p id="t1794" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1795" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1796" class="pln"><span class="str">                ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1797" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1798" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1799" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1800" class="pln"><span class="str">                ;[[[cog cog.outl('a\\n\\nb') ]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1801" class="pln"><span class="str">                a /\\n*+([)]>&lt;</span><span class="strut">&nbsp;</span></p>
+<p id="t1802" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1803" class="pln"><span class="str">                b /\\n*+([)]>&lt;</span><span class="strut">&nbsp;</span></p>
+<p id="t1804" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1805" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1806" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1807" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1808" 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*+([)]>&lt;'</span><span class="op">,</span> <span class="str">'test.cog'</span><span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1809" 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">&nbsp;</span></p>
+<p id="t1810" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1811" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1812" 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">&nbsp;</span></p>
+<p id="t1813" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1814" class="stm run hide_run">    <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1815" class="pln">        <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1816" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1817" class="pln"><span class="str">            for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut">&nbsp;</span></p>
+<p id="t1818" class="pln"><span class="str">                cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
+<p id="t1819" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1820" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1821" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1822" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1823" class="pln">        <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1824" class="pln"><span class="str">            //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1825" class="pln"><span class="str">            for fn in ['DoSomething', 'DoAnotherThing', 'DoLastThing']:</span><span class="strut">&nbsp;</span></p>
+<p id="t1826" class="pln"><span class="str">                cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
+<p id="t1827" class="pln"><span class="str">            //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1828" class="pln"><span class="str">            void DoSomething();</span><span class="strut">&nbsp;</span></p>
+<p id="t1829" class="pln"><span class="str">            void DoAnotherThing();</span><span class="strut">&nbsp;</span></p>
+<p id="t1830" class="pln"><span class="str">            void DoLastThing();</span><span class="strut">&nbsp;</span></p>
+<p id="t1831" class="pln"><span class="str">            //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1832" class="pln"><span class="str">            """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1833" class="pln">        <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1834" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1835" 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">&nbsp;</span></p>
+<p id="t1836" class="pln">        <span class="com"># for Windows</span><span class="strut">&nbsp;</span></p>
+<p id="t1837" class="exc">        <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'attrib -R %s'</span><span class="strut">&nbsp;</span></p>
+<p id="t1838" class="exc">        <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'attrib -R *'</span><span class="strut">&nbsp;</span></p>
+<p id="t1839" class="exc">    <span class="key">else</span><span class="op">:</span>   <span class="com">#pragma: no cover</span><span class="strut">&nbsp;</span></p>
+<p id="t1840" class="pln">        <span class="com"># for unix-like</span><span class="strut">&nbsp;</span></p>
+<p id="t1841" class="exc">        <span class="nam">cmd_w_args</span> <span class="op">=</span> <span class="str">'chmod +w %s'</span><span class="strut">&nbsp;</span></p>
+<p id="t1842" class="exc">        <span class="nam">cmd_w_asterisk</span> <span class="op">=</span> <span class="str">'chmod +w *'</span><span class="strut">&nbsp;</span></p>
 <p id="t1843" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1844" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1846" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1848" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1849" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1850" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1851" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1852" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1853" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1854" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1855" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
-<p id="t1856" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1857" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1858" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1859" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1860" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1861" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1862" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1863" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut">&nbsp;</span></p>
-<p id="t1864" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
-<p id="t1865" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1866" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1867" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1871" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1873" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1874" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1875" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1876" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1877" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1878" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1879" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1880" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1881" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut">&nbsp;</span></p>
-<p id="t1882" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1883" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1884" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1885" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1886" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1887" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1888" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1889" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1890" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1891" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1892" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1893" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t1894" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1895" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1896" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1900" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1902" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1903" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1904" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1905" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1906" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1907" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1908" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1909" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
-<p id="t1910" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) fooey</span><span class="strut">&nbsp;</span></p>
-<p id="t1911" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1912" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1913" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1914" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1915" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1916" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1917" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1918" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1919" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1920" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1921" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1922" class="pln"><span class="str">                //[[[end]]] fooey</span><span class="strut">&nbsp;</span></p>
-<p id="t1923" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1924" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t1925" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t1929" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t1931" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t1932" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1933" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1934" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1935" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1936" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1937" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1938" class="pln"><span class="str">                Xhis line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1939" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1940" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1941" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1844" 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">&nbsp;</span></p>
+<p id="t1845" 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">&nbsp;</span></p>
+<p id="t1846" 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">&nbsp;</span></p>
+<p id="t1847" 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">&nbsp;</span></p>
+<p id="t1848" 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">&nbsp;</span></p>
+<p id="t1849" 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">&nbsp;</span></p>
+<p id="t1850" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1851" 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">&nbsp;</span></p>
+<p id="t1852" 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">&nbsp;</span></p>
+<p id="t1853" 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">&nbsp;</span></p>
+<p id="t1854" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1855" 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">&nbsp;</span></p>
+<p id="t1856" 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">&nbsp;</span></p>
+<p id="t1857" 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">&nbsp;</span></p>
+<p id="t1858" 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">&nbsp;</span></p>
+<p id="t1859" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1860" 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">&nbsp;</span></p>
+<p id="t1861" 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">&nbsp;</span></p>
+<p id="t1862" 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">&nbsp;</span></p>
+<p id="t1863" 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">&nbsp;</span></p>
+<p id="t1864" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1865" 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">&nbsp;</span></p>
+<p id="t1866" 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">&nbsp;</span></p>
+<p id="t1867" 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">&nbsp;</span></p>
+<p id="t1868" 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">&nbsp;</span></p>
+<p id="t1869" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1870" 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">&nbsp;</span></p>
+<p id="t1871" 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">&nbsp;</span></p>
+<p id="t1872" 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">&nbsp;</span></p>
+<p id="t1873" 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">&nbsp;</span></p>
+<p id="t1874" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1875" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1876" 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">&nbsp;</span></p>
+<p id="t1877" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1878" 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">&nbsp;</span></p>
+<p id="t1879" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1880" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1881" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1882" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1883" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1884" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1885" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1886" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
+<p id="t1887" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1888" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1889" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1890" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1891" class="pln"><span class="str">                cog.outl("This line was generated.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1892" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1893" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1894" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut">&nbsp;</span></p>
+<p id="t1895" class="pln"><span class="str">                This line was not.</span><span class="strut">&nbsp;</span></p>
+<p id="t1896" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1897" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1898" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1899" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1900" 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">&nbsp;</span></p>
+<p id="t1901" 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">&nbsp;</span></p>
+<p id="t1902" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1903" 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">&nbsp;</span></p>
+<p id="t1904" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1905" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1906" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1907" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1908" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1909" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1910" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1911" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1912" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893)</span><span class="strut">&nbsp;</span></p>
+<p id="t1913" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1914" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1915" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1916" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1917" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1918" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1919" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1920" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1921" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t1922" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1923" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t1924" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1925" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1926" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1927" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1928" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1929" 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">&nbsp;</span></p>
+<p id="t1930" 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">&nbsp;</span></p>
+<p id="t1931" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1932" 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">&nbsp;</span></p>
+<p id="t1933" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1934" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1935" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1936" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1937" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1938" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1939" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1940" class="pln"><span class="str">                This line was generated.</span><span class="strut">&nbsp;</span></p>
+<p id="t1941" class="pln"><span class="str">                //[[[end]]] (checksum: 8adb13fb59b996a1c7f0065ea9f3d893) fooey</span><span class="strut">&nbsp;</span></p>
 <p id="t1942" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
 <p id="t1943" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1944" class="pln">            <span class="str">'cog2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1944" class="pln">            <span class="str">'cog1.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
 <p id="t1945" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
 <p id="t1946" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
 <p id="t1947" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
@@ -4245,277 +4276,308 @@
 <p id="t1949" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1950" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
 <p id="t1951" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1952" class="pln"><span class="str">                blah blah!</span><span class="strut">&nbsp;</span></p>
-<p id="t1953" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1952" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t1953" class="pln"><span class="str">                //[[[end]]] fooey</span><span class="strut">&nbsp;</span></p>
 <p id="t1954" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1955" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1956" class="pln">            <span class="str">'cog3.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1957" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1958" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1959" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1960" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1961" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1962" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1963" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1964" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1965" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1966" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t1967" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1968" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1969" class="pln">            <span class="str">'cog4.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1970" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1971" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1972" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1973" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1974" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1975" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1976" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1977" class="pln"><span class="str">                blah blah..</span><span class="strut">&nbsp;</span></p>
-<p id="t1978" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t1979" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t1980" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1981" class="pln">            <span class="str">'cog5.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1982" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1983" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1984" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1985" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1986" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t1987" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
-<p id="t1988" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1989" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
-<p id="t1990" class="pln"><span class="str">                extra</span><span class="strut">&nbsp;</span></p>
-<p id="t1991" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t1992" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1955" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t1956" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1957" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1958" 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">&nbsp;</span></p>
+<p id="t1959" 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">&nbsp;</span></p>
+<p id="t1960" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1961" 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">&nbsp;</span></p>
+<p id="t1962" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t1963" class="pln">            <span class="str">'cog1.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1964" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1965" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1966" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1967" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1968" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1969" class="pln"><span class="str">                Xhis line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t1970" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1971" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t1972" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1973" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1974" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1975" class="pln">            <span class="str">'cog2.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1976" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1977" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1978" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1979" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1980" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t1981" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t1982" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1983" class="pln"><span class="str">                blah blah!</span><span class="strut">&nbsp;</span></p>
+<p id="t1984" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1985" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1986" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t1987" class="pln">            <span class="str">'cog3.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t1988" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1989" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t1990" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t1991" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t1992" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
 <p id="t1993" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t1994" class="pln">            <span class="str">'cog6.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t1995" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t1996" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
-<p id="t1997" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
-<p id="t1998" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
-<p id="t1999" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2000" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
-<p id="t2001" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2002" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2003" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2023" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2029" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2030" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2032" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2034" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2035" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2036" class="pln"><span class="str">                //{{</span><span class="strut">&nbsp;</span></p>
-<p id="t2037" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2038" class="pln"><span class="str">                //}}</span><span class="strut">&nbsp;</span></p>
-<p id="t2039" class="pln"><span class="str">                //{{end}}</span><span class="strut">&nbsp;</span></p>
-<p id="t2040" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2041" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2042" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2043" class="pln"><span class="str">                //{{</span><span class="strut">&nbsp;</span></p>
-<p id="t2044" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2045" class="pln"><span class="str">                //}}</span><span class="strut">&nbsp;</span></p>
-<p id="t2046" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
-<p id="t2047" class="pln"><span class="str">                //{{end}}</span><span class="strut">&nbsp;</span></p>
-<p id="t2048" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2049" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2050" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2054" class="pln">            <span class="str">'--markers={{ }} {{end}}'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2055" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
-<p id="t2056" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2058" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2060" class="pln">        <span class="com"># Make sure the markers are properly re-escaped.</span><span class="strut">&nbsp;</span></p>
-<p id="t2061" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2062" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2063" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
-<p id="t2064" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2065" class="pln"><span class="str">                //**)</span><span class="strut">&nbsp;</span></p>
-<p id="t2066" class="pln"><span class="str">                //**(end)**</span><span class="strut">&nbsp;</span></p>
-<p id="t2067" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2068" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2069" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2070" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
-<p id="t2071" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2072" class="pln"><span class="str">                //**)</span><span class="strut">&nbsp;</span></p>
-<p id="t2073" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
-<p id="t2074" class="pln"><span class="str">                //**(end)**</span><span class="strut">&nbsp;</span></p>
-<p id="t2075" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2076" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2077" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2081" class="pln">            <span class="str">'--markers=**( **) **(end)**'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2082" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
-<p id="t2083" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2085" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2087" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2088" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2089" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
-<p id="t2090" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2091" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2092" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2093" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2094" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2095" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2096" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
-<p id="t2097" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
-<p id="t2098" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2099" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
-<p id="t2100" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2101" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2102" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2103" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2107" class="pln">            <span class="str">'--markers=**( ]]] [[[end]]]'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2108" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
-<p id="t2109" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2111" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2112" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2114" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2115" class="pln">    <span class="com"># Blake Winton's contributions.</span><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2117" class="pln">        <span class="com"># -o sets the output file.</span><span class="strut">&nbsp;</span></p>
+<p id="t1994" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t1995" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t1996" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t1997" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t1998" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t1999" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2000" class="pln">            <span class="str">'cog4.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2001" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2002" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t2003" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t2004" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t2005" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2006" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t2007" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2008" class="pln"><span class="str">                blah blah..</span><span class="strut">&nbsp;</span></p>
+<p id="t2009" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t2010" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2011" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2012" class="pln">            <span class="str">'cog5.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2013" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2014" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t2015" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t2016" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t2017" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2018" class="pln"><span class="str">                This line was newly</span><span class="strut">&nbsp;</span></p>
+<p id="t2019" class="pln"><span class="str">                generated by cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2020" class="pln"><span class="str">                blah blah.</span><span class="strut">&nbsp;</span></p>
+<p id="t2021" class="pln"><span class="str">                extra</span><span class="strut">&nbsp;</span></p>
+<p id="t2022" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t2023" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2024" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2025" class="pln">            <span class="str">'cog6.txt'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2026" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2027" class="pln"><span class="str">                cog.outl("This line was newly")</span><span class="strut">&nbsp;</span></p>
+<p id="t2028" class="pln"><span class="str">                cog.outl("generated by cog")</span><span class="strut">&nbsp;</span></p>
+<p id="t2029" class="pln"><span class="str">                cog.outl("blah blah.")</span><span class="strut">&nbsp;</span></p>
+<p id="t2030" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2031" class="pln"><span class="str">                //[[[end]]] (checksum: a8540982e5ad6b95c9e9a184b26f4346)</span><span class="strut">&nbsp;</span></p>
+<p id="t2032" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2033" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2034" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2035" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2036" 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">&nbsp;</span></p>
+<p id="t2037" 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">&nbsp;</span></p>
+<p id="t2038" 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">&nbsp;</span></p>
+<p id="t2039" 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">&nbsp;</span></p>
+<p id="t2040" 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">&nbsp;</span></p>
+<p id="t2041" 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">&nbsp;</span></p>
+<p id="t2042" 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">&nbsp;</span></p>
+<p id="t2043" 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">&nbsp;</span></p>
+<p id="t2044" 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">&nbsp;</span></p>
+<p id="t2045" 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">&nbsp;</span></p>
+<p id="t2046" 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">&nbsp;</span></p>
+<p id="t2047" 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">&nbsp;</span></p>
+<p id="t2048" 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">&nbsp;</span></p>
+<p id="t2049" 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">&nbsp;</span></p>
+<p id="t2050" 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">&nbsp;</span></p>
+<p id="t2051" 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">&nbsp;</span></p>
+<p id="t2052" 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">&nbsp;</span></p>
+<p id="t2053" 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">&nbsp;</span></p>
+<p id="t2054" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2055" 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">&nbsp;</span></p>
+<p id="t2056" 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">&nbsp;</span></p>
+<p id="t2057" 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">&nbsp;</span></p>
+<p id="t2058" 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">&nbsp;</span></p>
+<p id="t2059" 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">&nbsp;</span></p>
+<p id="t2060" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2061" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2062" 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">&nbsp;</span></p>
+<p id="t2063" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2064" 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">&nbsp;</span></p>
+<p id="t2065" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2066" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2067" class="pln"><span class="str">                //{{</span><span class="strut">&nbsp;</span></p>
+<p id="t2068" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2069" class="pln"><span class="str">                //}}</span><span class="strut">&nbsp;</span></p>
+<p id="t2070" class="pln"><span class="str">                //{{end}}</span><span class="strut">&nbsp;</span></p>
+<p id="t2071" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2072" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2073" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2074" class="pln"><span class="str">                //{{</span><span class="strut">&nbsp;</span></p>
+<p id="t2075" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2076" class="pln"><span class="str">                //}}</span><span class="strut">&nbsp;</span></p>
+<p id="t2077" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
+<p id="t2078" class="pln"><span class="str">                //{{end}}</span><span class="strut">&nbsp;</span></p>
+<p id="t2079" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2080" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2081" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2082" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2083" 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">&nbsp;</span></p>
+<p id="t2084" class="pln">            <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2085" class="pln">            <span class="str">'--markers={{ }} {{end}}'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2086" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
+<p id="t2087" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2088" 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">&nbsp;</span></p>
+<p id="t2089" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2090" 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">&nbsp;</span></p>
+<p id="t2091" class="pln">        <span class="com"># Make sure the markers are properly re-escaped.</span><span class="strut">&nbsp;</span></p>
+<p id="t2092" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2093" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2094" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
+<p id="t2095" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2096" class="pln"><span class="str">                //**)</span><span class="strut">&nbsp;</span></p>
+<p id="t2097" class="pln"><span class="str">                //**(end)**</span><span class="strut">&nbsp;</span></p>
+<p id="t2098" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2099" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2100" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2101" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
+<p id="t2102" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2103" class="pln"><span class="str">                //**)</span><span class="strut">&nbsp;</span></p>
+<p id="t2104" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
+<p id="t2105" class="pln"><span class="str">                //**(end)**</span><span class="strut">&nbsp;</span></p>
+<p id="t2106" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2107" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2108" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2109" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2110" 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">&nbsp;</span></p>
+<p id="t2111" class="pln">            <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2112" class="pln">            <span class="str">'--markers=**( **) **(end)**'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2113" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
+<p id="t2114" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2115" 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">&nbsp;</span></p>
+<p id="t2116" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2117" 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">&nbsp;</span></p>
 <p id="t2118" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
 <p id="t2119" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2120" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2121" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t2122" class="pln"><span class="str">                fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut">&nbsp;</span></p>
-<p id="t2123" class="pln"><span class="str">                for fn in fnames:</span><span class="strut">&nbsp;</span></p>
-<p id="t2124" class="pln"><span class="str">                    cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
-<p id="t2125" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2126" class="pln"><span class="str">                Some Sample Code Here</span><span class="strut">&nbsp;</span></p>
-<p id="t2127" class="pln"><span class="str">                //[[[end]]]Data Data</span><span class="strut">&nbsp;</span></p>
-<p id="t2128" class="pln"><span class="str">                And Some More</span><span class="strut">&nbsp;</span></p>
-<p id="t2129" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2130" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2131" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2132" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2133" class="pln"><span class="str">                void DoSomething();</span><span class="strut">&nbsp;</span></p>
-<p id="t2134" class="pln"><span class="str">                void DoAnotherThing();</span><span class="strut">&nbsp;</span></p>
-<p id="t2135" class="pln"><span class="str">                void DoLastThing();</span><span class="strut">&nbsp;</span></p>
-<p id="t2136" class="pln"><span class="str">                And Some More</span><span class="strut">&nbsp;</span></p>
-<p id="t2137" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2138" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2139" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
+<p id="t2120" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
+<p id="t2121" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2122" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2123" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2124" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2125" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2126" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2127" class="pln"><span class="str">                //**(</span><span class="strut">&nbsp;</span></p>
+<p id="t2128" class="pln"><span class="str">                cog.outl("void %s();" % "MyFunction")</span><span class="strut">&nbsp;</span></p>
+<p id="t2129" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2130" class="pln"><span class="str">                void MyFunction();</span><span class="strut">&nbsp;</span></p>
+<p id="t2131" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2132" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2133" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2134" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2135" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2136" 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">&nbsp;</span></p>
+<p id="t2137" class="pln">            <span class="str">'argv0'</span><span class="op">,</span> <span class="str">'-r'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2138" class="pln">            <span class="str">'--markers=**( ]]] [[[end]]]'</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2139" class="pln">            <span class="str">'test.cog'</span><span class="strut">&nbsp;</span></p>
+<p id="t2140" class="pln">        <span class="op">]</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2141" 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">&nbsp;</span></p>
+<p id="t2142" class="pln"><span class="strut">&nbsp;</span></p>
 <p id="t2143" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2145" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2146" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2147" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2148" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
-<p id="t2149" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2150" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2154" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2157" class="pln">        <span class="com"># processFile().</span><span class="strut">&nbsp;</span></p>
-<p id="t2158" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2159" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2160" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2161" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t2162" class="pln"><span class="str">                for fn in fnames:</span><span class="strut">&nbsp;</span></p>
-<p id="t2163" class="pln"><span class="str">                    cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
-<p id="t2164" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2165" class="pln"><span class="str">                Some Sample Code Here</span><span class="strut">&nbsp;</span></p>
-<p id="t2166" class="pln"><span class="str">                //[[[end]]]"""</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2167" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2168" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2169" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
-<p id="t2170" class="pln"><span class="str">                void DoBlake();</span><span class="strut">&nbsp;</span></p>
-<p id="t2171" class="pln"><span class="str">                void DoWinton();</span><span class="strut">&nbsp;</span></p>
-<p id="t2172" class="pln"><span class="str">                void DoContribution();</span><span class="strut">&nbsp;</span></p>
-<p id="t2173" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2174" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2175" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2182" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2183" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
+<p id="t2144" 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">&nbsp;</span></p>
+<p id="t2145" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2146" class="pln">    <span class="com"># Blake Winton's contributions.</span><span class="strut">&nbsp;</span></p>
+<p id="t2147" 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">&nbsp;</span></p>
+<p id="t2148" class="pln">        <span class="com"># -o sets the output file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2149" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2150" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2151" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2152" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2153" class="pln"><span class="str">                fnames = ['DoSomething', 'DoAnotherThing', 'DoLastThing']</span><span class="strut">&nbsp;</span></p>
+<p id="t2154" class="pln"><span class="str">                for fn in fnames:</span><span class="strut">&nbsp;</span></p>
+<p id="t2155" class="pln"><span class="str">                    cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
+<p id="t2156" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2157" class="pln"><span class="str">                Some Sample Code Here</span><span class="strut">&nbsp;</span></p>
+<p id="t2158" class="pln"><span class="str">                //[[[end]]]Data Data</span><span class="strut">&nbsp;</span></p>
+<p id="t2159" class="pln"><span class="str">                And Some More</span><span class="strut">&nbsp;</span></p>
+<p id="t2160" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2161" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2162" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2163" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2164" class="pln"><span class="str">                void DoSomething();</span><span class="strut">&nbsp;</span></p>
+<p id="t2165" class="pln"><span class="str">                void DoAnotherThing();</span><span class="strut">&nbsp;</span></p>
+<p id="t2166" class="pln"><span class="str">                void DoLastThing();</span><span class="strut">&nbsp;</span></p>
+<p id="t2167" class="pln"><span class="str">                And Some More</span><span class="strut">&nbsp;</span></p>
+<p id="t2168" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2169" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2170" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2171" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2172" 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">&nbsp;</span></p>
+<p id="t2173" 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">&nbsp;</span></p>
+<p id="t2174" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2175" 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">&nbsp;</span></p>
+<p id="t2176" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2177" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2178" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2179" class="pln"><span class="str">                """</span><span class="strut">&nbsp;</span></p>
+<p id="t2180" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2181" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2182" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2183" 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">&nbsp;</span></p>
+<p id="t2184" 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">&nbsp;</span></p>
 <p id="t2185" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2187" class="pln">        <span class="com"># Test that cog.error() doesn't show a traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t2188" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2189" class="pln">            <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2190" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t2191" class="pln"><span class="str">                cog.error("Something Bad!")</span><span class="strut">&nbsp;</span></p>
-<p id="t2192" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2193" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2194" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2195" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2196" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2201" class="pln"><span class="strut">&nbsp;</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">&nbsp;</span></p>
-<p id="t2203" class="pln">        <span class="com"># Test that a genuine error does show a traceback.</span><span class="strut">&nbsp;</span></p>
-<p id="t2204" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
-<p id="t2205" class="pln">            <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
-<p id="t2206" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
-<p id="t2207" class="pln"><span class="str">                raise RuntimeError("Hey!")</span><span class="strut">&nbsp;</span></p>
-<p id="t2208" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2209" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
-<p id="t2210" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
-<p id="t2211" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
-<p id="t2212" class="pln"><span class="strut">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</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">&nbsp;</span></p>
-<p id="t2219" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2220" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t2221" class="pln"><span class="com"># Things not yet tested:</span><span class="strut">&nbsp;</span></p>
-<p id="t2222" class="pln"><span class="com"># - A bad -w command (currently fails silently).</span><span class="strut">&nbsp;</span></p>
+<p id="t2186" 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">&nbsp;</span></p>
+<p id="t2187" class="pln">        <span class="com"># Blake Winton contributed a way to set the globals that will be used in</span><span class="strut">&nbsp;</span></p>
+<p id="t2188" class="pln">        <span class="com"># processFile().</span><span class="strut">&nbsp;</span></p>
+<p id="t2189" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2190" class="pln">            <span class="str">'test.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2191" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2192" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2193" class="pln"><span class="str">                for fn in fnames:</span><span class="strut">&nbsp;</span></p>
+<p id="t2194" class="pln"><span class="str">                    cog.outl("void %s();" % fn)</span><span class="strut">&nbsp;</span></p>
+<p id="t2195" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2196" class="pln"><span class="str">                Some Sample Code Here</span><span class="strut">&nbsp;</span></p>
+<p id="t2197" class="pln"><span class="str">                //[[[end]]]"""</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2198" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2199" class="pln">            <span class="str">'test.out'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2200" class="pln"><span class="str">                // This is my C++ file.</span><span class="strut">&nbsp;</span></p>
+<p id="t2201" class="pln"><span class="str">                void DoBlake();</span><span class="strut">&nbsp;</span></p>
+<p id="t2202" class="pln"><span class="str">                void DoWinton();</span><span class="strut">&nbsp;</span></p>
+<p id="t2203" class="pln"><span class="str">                void DoContribution();</span><span class="strut">&nbsp;</span></p>
+<p id="t2204" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2205" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2206" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2207" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2208" class="stm mis">        <span class="nam">globals</span> <span class="op">=</span> <span class="op">{</span><span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2209" 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">&nbsp;</span></p>
+<p id="t2210" 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">&nbsp;</span></p>
+<p id="t2211" 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">&nbsp;</span></p>
+<p id="t2212" 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">&nbsp;</span></p>
+<p id="t2213" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2214" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2215" 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">&nbsp;</span></p>
+<p id="t2216" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2217" 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">&nbsp;</span></p>
+<p id="t2218" class="pln">        <span class="com"># Test that cog.error() doesn't show a traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t2219" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2220" class="pln">            <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2221" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2222" class="pln"><span class="str">                cog.error("Something Bad!")</span><span class="strut">&nbsp;</span></p>
+<p id="t2223" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2224" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2225" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2226" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2227" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2228" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2229" 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">&nbsp;</span></p>
+<p id="t2230" 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">&nbsp;</span></p>
+<p id="t2231" 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">&nbsp;</span></p>
+<p id="t2232" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2233" 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">&nbsp;</span></p>
+<p id="t2234" class="pln">        <span class="com"># Test that a genuine error does show a traceback.</span><span class="strut">&nbsp;</span></p>
+<p id="t2235" class="stm mis">        <span class="nam">d</span> <span class="op">=</span> <span class="op">{</span><span class="strut">&nbsp;</span></p>
+<p id="t2236" class="pln">            <span class="str">'error.cog'</span><span class="op">:</span> <span class="str">"""\</span><span class="strut">&nbsp;</span></p>
+<p id="t2237" class="pln"><span class="str">                //[[[cog</span><span class="strut">&nbsp;</span></p>
+<p id="t2238" class="pln"><span class="str">                raise RuntimeError("Hey!")</span><span class="strut">&nbsp;</span></p>
+<p id="t2239" class="pln"><span class="str">                //]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2240" class="pln"><span class="str">                //[[[end]]]</span><span class="strut">&nbsp;</span></p>
+<p id="t2241" class="pln"><span class="str">                """</span><span class="op">,</span><span class="strut">&nbsp;</span></p>
+<p id="t2242" class="pln">            <span class="op">}</span><span class="strut">&nbsp;</span></p>
+<p id="t2243" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2244" class="stm mis">        <span class="nam">makeFiles</span><span class="op">(</span><span class="nam">d</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t2245" 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">&nbsp;</span></p>
+<p id="t2246" 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">&nbsp;</span></p>
+<p id="t2247" 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">&nbsp;</span></p>
+<p id="t2248" 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">&nbsp;</span></p>
+<p id="t2249" 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">&nbsp;</span></p>
+<p id="t2250" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2251" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t2252" class="pln"><span class="com"># Things not yet tested:</span><span class="strut">&nbsp;</span></p>
+<p id="t2253" class="pln"><span class="com"># - A bad -w command (currently fails silently).</span><span class="strut">&nbsp;</span></p>
 
             </td>
         </tr>
@@ -4525,8 +4587,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_makefiles_py.html b/doc/sample_html/cogapp_test_makefiles_py.html
index 7d7364d7..88b65d17 100644
--- a/doc/sample_html/cogapp_test_makefiles_py.html
+++ b/doc/sample_html/cogapp_test_makefiles_py.html
@@ -265,8 +265,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_test_whiteutils_py.html b/doc/sample_html/cogapp_test_whiteutils_py.html
index 3d67e728..4ddf438c 100644
--- a/doc/sample_html/cogapp_test_whiteutils_py.html
+++ b/doc/sample_html/cogapp_test_whiteutils_py.html
@@ -285,8 +285,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/cogapp_whiteutils_py.html b/doc/sample_html/cogapp_whiteutils_py.html
index 1a44dc2c..2a65bfd1 100644
--- a/doc/sample_html/cogapp_whiteutils_py.html
+++ b/doc/sample_html/cogapp_whiteutils_py.html
@@ -223,8 +223,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/index.html b/doc/sample_html/index.html
index 82004892..06ecdcd4 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.59%</span>
+            <span class="pc_cov">37.52%</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>1352</td>
-                <td>841</td>
+                <td>1361</td>
+                <td>848</td>
                 <td>13</td>
                 
-                <td>236</td>
-                <td>30</td>
+                <td>238</td>
+                <td>31</td>
                 
-                <td class="right" data-ratio="597 1588">37.59%</td>
+                <td class="right" data-ratio="600 1599">37.52%</td>
             </tr>
         </tfoot>
         <tbody>
@@ -121,14 +121,14 @@
             
             <tr class="file">
                 <td class="name left"><a href="cogapp_cogapp_py.html">cogapp/cogapp.py</a></td>
-                <td>427</td>
-                <td>197</td>
+                <td>429</td>
+                <td>198</td>
                 <td>4</td>
                 
-                <td>176</td>
-                <td>26</td>
+                <td>178</td>
+                <td>27</td>
                 
-                <td class="right" data-ratio="284 603">47.10%</td>
+                <td class="right" data-ratio="286 607">47.12%</td>
             </tr>
             
             <tr class="file">
@@ -145,14 +145,14 @@
             
             <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>711</td>
+                <td>492</td>
                 <td>6</td>
                 
                 <td>6</td>
                 <td>0</td>
                 
-                <td class="right" data-ratio="220 710">30.99%</td>
+                <td class="right" data-ratio="221 717">30.82%</td>
             </tr>
             
             <tr class="file">
@@ -202,8 +202,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.3.2</a>,
-            created at 2017-01-16 18:24
+            <a class="nav" href="https://coverage.readthedocs.io">coverage.py v4.4</a>,
+            created at 2017-05-07 19:06
         </p>
     </div>
 </div>
diff --git a/doc/sample_html/status.json b/doc/sample_html/status.json
index 03bc1bca..b312b29c 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,427,4,197,176,26,122]},"hash":"14e09b853b264fdef21aef70c12a3e33"},"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,486,6,0,4]},"hash":"43b3b366e5f19ac62d84f20d2e39553a"},"cogapp_makefiles_py":{"index":{"relative_filename":"cogapp/makefiles.py","html_filename":"cogapp_makefiles_py.html","nums":[1,28,3,20,14,0,14]},"hash":"8e1d1a527f997b8217a7853660c0d6ab"},"cogapp_whiteutils_py":{"index":{"relative_filename":"cogapp/whiteutils.py","html_filename":"cogapp_whiteutils_py.html","nums":[1,45,0,3,32,3,3]},"hash":"9ca932a2b79ba4730c48196ed24b6cb9"},"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.3.2","settings":"ab77d6eb8ebccdfdc6ebe1a73a96a083","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,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,429,4,198,178,27,123]},"hash":"48f37027c1e3a21fe54dfb8f8471b941"},"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,711,6,492,6,0,4]},"hash":"699ab4bf95a21b8dbc19e76fefe9aa5b"},"cogapp_makefiles_py":{"index":{"relative_filename":"cogapp/makefiles.py","html_filename":"cogapp_makefiles_py.html","nums":[1,28,3,20,14,0,14]},"hash":"8e1d1a527f997b8217a7853660c0d6ab"},"cogapp_whiteutils_py":{"index":{"relative_filename":"cogapp/whiteutils.py","html_filename":"cogapp_whiteutils_py.html","nums":[1,45,0,3,32,3,3]},"hash":"9ca932a2b79ba4730c48196ed24b6cb9"},"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.4","settings":"7e3e09b2ab5e0a8f83a323f08db841f3","format":1}
\ No newline at end of file
-- 
cgit v1.2.1