taskjuggler 0.0.8 → 0.0.9

data/doc/TaskJuggler/TextReport.html

@@ -133,6 +133,8 @@
 				
 					<li><a href="../TaskJuggler/AttributeDefinition.html">TaskJuggler::AttributeDefinition</a></li>
 				
+					<li><a href="../TaskJuggler/AttributeOverwrite.html">TaskJuggler::AttributeOverwrite</a></li>
+				
 					<li><a href="../TaskJuggler/BatchProcessor.html">TaskJuggler::BatchProcessor</a></li>
 				
 					<li><a href="../TaskJuggler/Booking.html">TaskJuggler::Booking</a></li>
@@ -211,6 +213,8 @@
 				
 					<li><a href="../TaskJuggler/Interval.html">TaskJuggler::Interval</a></li>
 				
+					<li><a href="../TaskJuggler/IntervalList.html">TaskJuggler::IntervalList</a></li>
+				
 					<li><a href="../TaskJuggler/IntervalListAttribute.html">TaskJuggler::IntervalListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/JobInfo.html">TaskJuggler::JobInfo</a></li>
@@ -243,6 +247,8 @@
 				
 					<li><a href="../TaskJuggler/LogicalExpressionAttribute.html">TaskJuggler::LogicalExpressionAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/LogicalExpressionListAttribute.html">TaskJuggler::LogicalExpressionListAttribute</a></li>
+				
 					<li><a href="../TaskJuggler/LogicalFlag.html">TaskJuggler::LogicalFlag</a></li>
 				
 					<li><a href="../TaskJuggler/LogicalFunction.html">TaskJuggler::LogicalFunction</a></li>
@@ -523,6 +529,8 @@
 				
 					<li><a href="../TaskJuggler/WebServer.html">TaskJuggler::WebServer</a></li>
 				
+					<li><a href="../TaskJuggler/WelcomePage.html">TaskJuggler::WelcomePage</a></li>
+				
 					<li><a href="../TaskJuggler/WorkingHours.html">TaskJuggler::WorkingHours</a></li>
 				
 					<li><a href="../TaskJuggler/WorkingHoursAttribute.html">TaskJuggler::WorkingHoursAttribute</a></li>
@@ -549,8 +557,6 @@
 				
 					<li><a href="../String.html">String</a></li>
 				
-					<li><a href="../StringIO.html">StringIO</a></li>
-				
 				</ul>
 				<div id="no-class-search-results" style="display: none;">No matching classes.</div>
 			</div>
@@ -694,13 +700,13 @@ footer and a central text with margin elements left and right.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 24</span>
-24:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">report</span>)
-25:       <span class="ruby-keyword kw">super</span>
-26: 
-27:       <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@cWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">0</span>
-28:       <span class="ruby-ivar">@lPadding</span> = <span class="ruby-ivar">@cPadding</span> = <span class="ruby-ivar">@rPadding</span> = <span class="ruby-value">0</span>
-29:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 25</span>
+25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">report</span>)
+26:       <span class="ruby-keyword kw">super</span>
+27: 
+28:       <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@cWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">0</span>
+29:       <span class="ruby-ivar">@lPadding</span> = <span class="ruby-ivar">@cPadding</span> = <span class="ruby-ivar">@rPadding</span> = <span class="ruby-value">0</span>
+30:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -737,38 +743,38 @@ footer and a central text with margin elements left and right.
 					<div class="method-source-code"
 						id="generate-ntermediate-ormat-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 31</span>
-31:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateIntermediateFormat</span>
-32:       <span class="ruby-keyword kw">super</span>
-33: 
-34:       <span class="ruby-comment cmt"># A width of 0 means, the columns flexible.</span>
-35:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>)
-36:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-37:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">20</span>
-38:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">60</span>
-39:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-ivar">@cPadding</span> = <span class="ruby-value">2</span>
-40:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-41:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">25</span>
-42:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
-43:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-value">2</span>
-44:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-45:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
-46:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">25</span>
-47:           <span class="ruby-ivar">@cPadding</span> = <span class="ruby-value">2</span>
-48:         <span class="ruby-keyword kw">else</span>
-49:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">100</span>
-50:         <span class="ruby-keyword kw">end</span>
-51:       <span class="ruby-keyword kw">else</span>
-52:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-53:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">50</span>
-54:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-value">2</span>
-55:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-56:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">100</span>
-57:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-58:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">100</span>
-59:         <span class="ruby-keyword kw">end</span>
-60:       <span class="ruby-keyword kw">end</span>
-61:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 32</span>
+32:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generateIntermediateFormat</span>
+33:       <span class="ruby-keyword kw">super</span>
+34: 
+35:       <span class="ruby-comment cmt"># A width of 0 means, the columns flexible.</span>
+36:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>)
+37:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+38:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">20</span>
+39:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">60</span>
+40:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-ivar">@cPadding</span> = <span class="ruby-value">2</span>
+41:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+42:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">25</span>
+43:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
+44:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-value">2</span>
+45:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+46:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">75</span>
+47:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">25</span>
+48:           <span class="ruby-ivar">@cPadding</span> = <span class="ruby-value">2</span>
+49:         <span class="ruby-keyword kw">else</span>
+50:           <span class="ruby-ivar">@cWidth</span> = <span class="ruby-value">100</span>
+51:         <span class="ruby-keyword kw">end</span>
+52:       <span class="ruby-keyword kw">else</span>
+53:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+54:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">50</span>
+55:           <span class="ruby-ivar">@lPadding</span> = <span class="ruby-value">2</span>
+56:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+57:           <span class="ruby-ivar">@lWidth</span> = <span class="ruby-value">100</span>
+58:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+59:           <span class="ruby-ivar">@rWidth</span> = <span class="ruby-value">100</span>
+60:         <span class="ruby-keyword kw">end</span>
+61:       <span class="ruby-keyword kw">end</span>
+62:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -799,13 +805,13 @@ footer and a central text with margin elements left and right.
 					<div class="method-source-code"
 						id="to-csv-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 89</span>
-89:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>
-90:       <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">warning</span>(<span class="ruby-value str">'text_report_no_csv'</span>,
-91:                       <span class="ruby-node">&quot;textreport '#{@report.fullId}' cannot be converted &quot;</span> <span class="ruby-operator">+</span>
-92:                       <span class="ruby-value str">&quot;into CSV format&quot;</span>)
-93:       <span class="ruby-keyword kw">nil</span>
-94:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 90</span>
+90:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_csv</span>
+91:       <span class="ruby-ivar">@report</span>.<span class="ruby-identifier">warning</span>(<span class="ruby-value str">'text_report_no_csv'</span>,
+92:                       <span class="ruby-node">&quot;textreport '#{@report.fullId}' cannot be converted &quot;</span> <span class="ruby-operator">+</span>
+93:                       <span class="ruby-value str">&quot;into CSV format&quot;</span>)
+94:       <span class="ruby-keyword kw">nil</span>
+95:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -836,32 +842,32 @@ footer and a central text with margin elements left and right.
 					<div class="method-source-code"
 						id="to-html-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 63</span>
-63:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_html</span>
-64:       <span class="ruby-identifier">html</span> = []
-65:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'header'</span>)
-66:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
-67:         <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">table</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'table'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tj_text_page'</span>,
-68:                                                  <span class="ruby-value str">'cellspacing'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'0'</span>))
-69:         <span class="ruby-identifier">table</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">row</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'tr'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tj_text_row'</span>))
-70:         <span class="ruby-node">%( left center right)</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
-71:           <span class="ruby-identifier">width</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Width'</span>)
-72:           <span class="ruby-identifier">padding</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Padding'</span>)
-73:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-identifier">i</span>)
-74:             <span class="ruby-identifier">row</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">col</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'td'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;tj_column_#{i}&quot;</span>))
-75:             <span class="ruby-identifier">style</span> = <span class="ruby-value str">''</span>
-76:             <span class="ruby-identifier">style</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;width:#{width}%; &quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">width</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-77:             <span class="ruby-identifier">style</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;padding-right:#{padding}%; &quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">padding</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-78:             <span class="ruby-identifier">col</span>[<span class="ruby-value str">'style'</span>] = <span class="ruby-identifier">style</span>
-79:             <span class="ruby-identifier">col</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-identifier">i</span>)
-80:           <span class="ruby-keyword kw">end</span>
-81:         <span class="ruby-keyword kw">end</span>
-82: 
-83:       <span class="ruby-keyword kw">end</span>
-84:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'footer'</span>)
-85: 
-86:       <span class="ruby-identifier">html</span>
-87:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/reports/TextReport.rb, line 64</span>
+64:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_html</span>
+65:       <span class="ruby-identifier">html</span> = []
+66:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'header'</span>)
+67:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'left'</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'center'</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">a</span>(<span class="ruby-value str">'right'</span>)
+68:         <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">table</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'table'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tj_text_page'</span>,
+69:                                                  <span class="ruby-value str">'cellspacing'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'0'</span>))
+70:         <span class="ruby-identifier">table</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">row</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'tr'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tj_text_row'</span>))
+71:         <span class="ruby-node">%( left center right)</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
+72:           <span class="ruby-identifier">width</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Width'</span>)
+73:           <span class="ruby-identifier">padding</span> = <span class="ruby-identifier">instance_variable_get</span>(<span class="ruby-value str">'@'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">i</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">chr</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'Padding'</span>)
+74:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">a</span>(<span class="ruby-identifier">i</span>)
+75:             <span class="ruby-identifier">row</span> <span class="ruby-operator">&lt;&lt;</span> (<span class="ruby-identifier">col</span> = <span class="ruby-constant">XMLElement</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'td'</span>, <span class="ruby-value str">'class'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;tj_column_#{i}&quot;</span>))
+76:             <span class="ruby-identifier">style</span> = <span class="ruby-value str">''</span>
+77:             <span class="ruby-identifier">style</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;width:#{width}%; &quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">width</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+78:             <span class="ruby-identifier">style</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;padding-right:#{padding}%; &quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">padding</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+79:             <span class="ruby-identifier">col</span>[<span class="ruby-value str">'style'</span>] = <span class="ruby-identifier">style</span>
+80:             <span class="ruby-identifier">col</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-identifier">i</span>)
+81:           <span class="ruby-keyword kw">end</span>
+82:         <span class="ruby-keyword kw">end</span>
+83: 
+84:       <span class="ruby-keyword kw">end</span>
+85:       <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rt_to_html</span>(<span class="ruby-value str">'footer'</span>)
+86: 
+87:       <span class="ruby-identifier">html</span>
+88:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/TextScanner.html

@@ -172,6 +172,8 @@
 				
 					<li><a href="../TaskJuggler/AttributeDefinition.html">TaskJuggler::AttributeDefinition</a></li>
 				
+					<li><a href="../TaskJuggler/AttributeOverwrite.html">TaskJuggler::AttributeOverwrite</a></li>
+				
 					<li><a href="../TaskJuggler/BatchProcessor.html">TaskJuggler::BatchProcessor</a></li>
 				
 					<li><a href="../TaskJuggler/Booking.html">TaskJuggler::Booking</a></li>
@@ -250,6 +252,8 @@
 				
 					<li><a href="../TaskJuggler/Interval.html">TaskJuggler::Interval</a></li>
 				
+					<li><a href="../TaskJuggler/IntervalList.html">TaskJuggler::IntervalList</a></li>
+				
 					<li><a href="../TaskJuggler/IntervalListAttribute.html">TaskJuggler::IntervalListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/JobInfo.html">TaskJuggler::JobInfo</a></li>
@@ -282,6 +286,8 @@
 				
 					<li><a href="../TaskJuggler/LogicalExpressionAttribute.html">TaskJuggler::LogicalExpressionAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/LogicalExpressionListAttribute.html">TaskJuggler::LogicalExpressionListAttribute</a></li>
+				
 					<li><a href="../TaskJuggler/LogicalFlag.html">TaskJuggler::LogicalFlag</a></li>
 				
 					<li><a href="../TaskJuggler/LogicalFunction.html">TaskJuggler::LogicalFunction</a></li>
@@ -562,6 +568,8 @@
 				
 					<li><a href="../TaskJuggler/WebServer.html">TaskJuggler::WebServer</a></li>
 				
+					<li><a href="../TaskJuggler/WelcomePage.html">TaskJuggler::WelcomePage</a></li>
+				
 					<li><a href="../TaskJuggler/WorkingHours.html">TaskJuggler::WorkingHours</a></li>
 				
 					<li><a href="../TaskJuggler/WorkingHoursAttribute.html">TaskJuggler::WorkingHoursAttribute</a></li>
@@ -588,8 +596,6 @@
 				
 					<li><a href="../String.html">String</a></li>
 				
-					<li><a href="../StringIO.html">StringIO</a></li>
-				
 				</ul>
 				<div id="no-class-search-results" style="display: none;">No matching classes.</div>
 			</div>
@@ -653,46 +659,46 @@ messages.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 188</span>
-188:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">masterFile</span>, <span class="ruby-identifier">messageHandler</span>, <span class="ruby-identifier">tokenPatterns</span>, <span class="ruby-identifier">defaultMode</span>)
-189:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
-190:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
-191:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
-192:       <span class="ruby-comment cmt"># text.</span>
-193:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
-194:       <span class="ruby-comment cmt"># The currently processed IO object.</span>
-195:       <span class="ruby-ivar">@cf</span> = <span class="ruby-keyword kw">nil</span>
-196:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
-197:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 2 elements, the IO object and</span>
-198:       <span class="ruby-comment cmt"># the @tokenBuffer.</span>
-199:       <span class="ruby-ivar">@fileStack</span> = []
-200:       <span class="ruby-comment cmt"># This flag is set if we have reached the end of a file. Since we will</span>
-201:       <span class="ruby-comment cmt"># only know when the next new token is requested that the file is really</span>
-202:       <span class="ruby-comment cmt"># done now, we have to use this flag.</span>
-203:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-204:       <span class="ruby-comment cmt"># True if the scanner operates on a buffer.</span>
-205:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
-206:       <span class="ruby-comment cmt"># A SourceFileInfo of the start of the currently processed token.</span>
-207:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-keyword kw">nil</span>
-208:       <span class="ruby-comment cmt"># Line number correction for error messages.</span>
-209:       <span class="ruby-ivar">@lineDelta</span> = <span class="ruby-value">0</span>
-210:       <span class="ruby-comment cmt"># Lists of regexps that describe the detectable tokens. The Arrays are</span>
-211:       <span class="ruby-comment cmt"># grouped by mode.</span>
-212:       <span class="ruby-ivar">@patternsByMode</span> = { }
-213:       <span class="ruby-comment cmt"># The currently active scanner mode.</span>
-214:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-keyword kw">nil</span>
-215:       <span class="ruby-comment cmt"># Points to the currently active pattern set as defined by the mode.</span>
-216:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-keyword kw">nil</span>
-217: 
-218:       <span class="ruby-identifier">tokenPatterns</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">pat</span><span class="ruby-operator">|</span>
-219:         <span class="ruby-identifier">type</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">0</span>]
-220:         <span class="ruby-identifier">regExp</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">1</span>]
-221:         <span class="ruby-identifier">mode</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">||</span> <span class="ruby-value">:tjp</span>
-222:         <span class="ruby-identifier">postProc</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">3</span>]
-223:         <span class="ruby-identifier">addPattern</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-identifier">postProc</span>)
-224:       <span class="ruby-keyword kw">end</span>
-225:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">mode</span> = <span class="ruby-identifier">defaultMode</span>
-226:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 189</span>
+189:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">masterFile</span>, <span class="ruby-identifier">messageHandler</span>, <span class="ruby-identifier">tokenPatterns</span>, <span class="ruby-identifier">defaultMode</span>)
+190:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
+191:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
+192:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
+193:       <span class="ruby-comment cmt"># text.</span>
+194:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
+195:       <span class="ruby-comment cmt"># The currently processed IO object.</span>
+196:       <span class="ruby-ivar">@cf</span> = <span class="ruby-keyword kw">nil</span>
+197:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
+198:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 2 elements, the IO object and</span>
+199:       <span class="ruby-comment cmt"># the @tokenBuffer.</span>
+200:       <span class="ruby-ivar">@fileStack</span> = []
+201:       <span class="ruby-comment cmt"># This flag is set if we have reached the end of a file. Since we will</span>
+202:       <span class="ruby-comment cmt"># only know when the next new token is requested that the file is really</span>
+203:       <span class="ruby-comment cmt"># done now, we have to use this flag.</span>
+204:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+205:       <span class="ruby-comment cmt"># True if the scanner operates on a buffer.</span>
+206:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
+207:       <span class="ruby-comment cmt"># A SourceFileInfo of the start of the currently processed token.</span>
+208:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-keyword kw">nil</span>
+209:       <span class="ruby-comment cmt"># Line number correction for error messages.</span>
+210:       <span class="ruby-ivar">@lineDelta</span> = <span class="ruby-value">0</span>
+211:       <span class="ruby-comment cmt"># Lists of regexps that describe the detectable tokens. The Arrays are</span>
+212:       <span class="ruby-comment cmt"># grouped by mode.</span>
+213:       <span class="ruby-ivar">@patternsByMode</span> = { }
+214:       <span class="ruby-comment cmt"># The currently active scanner mode.</span>
+215:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-keyword kw">nil</span>
+216:       <span class="ruby-comment cmt"># Points to the currently active pattern set as defined by the mode.</span>
+217:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-keyword kw">nil</span>
+218: 
+219:       <span class="ruby-identifier">tokenPatterns</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">pat</span><span class="ruby-operator">|</span>
+220:         <span class="ruby-identifier">type</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">0</span>]
+221:         <span class="ruby-identifier">regExp</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">1</span>]
+222:         <span class="ruby-identifier">mode</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">2</span>] <span class="ruby-operator">||</span> <span class="ruby-value">:tjp</span>
+223:         <span class="ruby-identifier">postProc</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">3</span>]
+224:         <span class="ruby-identifier">addPattern</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-identifier">postProc</span>)
+225:       <span class="ruby-keyword kw">end</span>
+226:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">mode</span> = <span class="ruby-identifier">defaultMode</span>
+227:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -731,10 +737,10 @@ Add a <a href="Macro.html">Macro</a> to the macro translation table.
 					<div class="method-source-code"
 						id="add-acro-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 440</span>
-440:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
-441:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
-442:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 447</span>
+447:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
+448:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
+449:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -775,20 +781,20 @@ href="../String.html">String</a> and returns them again in an Array.
 					<div class="method-source-code"
 						id="add-attern-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 236</span>
-236:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addPattern</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-identifier">postProc</span> = <span class="ruby-keyword kw">nil</span>)
-237:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mode</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Array</span>)
-238:         <span class="ruby-identifier">mode</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">m</span><span class="ruby-operator">|</span>
-239:           <span class="ruby-comment cmt"># The pattern is active in multiple modes</span>
-240:           <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">m</span>] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@patternsByMode</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">m</span>)
-241:           <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">m</span>] <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">postProc</span> ]
-242:         <span class="ruby-keyword kw">end</span>
-243:       <span class="ruby-keyword kw">else</span>
-244:         <span class="ruby-comment cmt"># The pattern is only active in one specific mode.</span>
-245:         <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">mode</span>] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@patternsByMode</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">mode</span>)
-246:         <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">mode</span>] <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">postProc</span> ]
-247:       <span class="ruby-keyword kw">end</span>
-248:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 237</span>
+237:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addPattern</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">mode</span>, <span class="ruby-identifier">postProc</span> = <span class="ruby-keyword kw">nil</span>)
+238:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mode</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Array</span>)
+239:         <span class="ruby-identifier">mode</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">m</span><span class="ruby-operator">|</span>
+240:           <span class="ruby-comment cmt"># The pattern is active in multiple modes</span>
+241:           <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">m</span>] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@patternsByMode</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">m</span>)
+242:           <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">m</span>] <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">postProc</span> ]
+243:         <span class="ruby-keyword kw">end</span>
+244:       <span class="ruby-keyword kw">else</span>
+245:         <span class="ruby-comment cmt"># The pattern is only active in one specific mode.</span>
+246:         <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">mode</span>] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@patternsByMode</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">mode</span>)
+247:         <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">mode</span>] <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">regExp</span>, <span class="ruby-identifier">postProc</span> ]
+248:       <span class="ruby-keyword kw">end</span>
+249:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -821,15 +827,15 @@ Finish processing and reset all data structures.
 					<div class="method-source-code"
 						id="close-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 278</span>
-278:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-279:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
-280:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
-281:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
-282:       <span class="ruby-keyword kw">end</span>
-283:       <span class="ruby-ivar">@fileStack</span> = []
-284:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-285:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 279</span>
+279:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+280:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
+281:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
+282:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
+283:       <span class="ruby-keyword kw">end</span>
+284:       <span class="ruby-ivar">@fileStack</span> = []
+285:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+286:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -862,10 +868,10 @@ Call this function to report any errors related to the parsed input.
 					<div class="method-source-code"
 						id="error-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 469</span>
-469:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">data</span> = <span class="ruby-keyword kw">nil</span>)
-470:       <span class="ruby-identifier">message</span>(<span class="ruby-value">:error</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
-471:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 476</span>
+476:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">data</span> = <span class="ruby-keyword kw">nil</span>)
+477:       <span class="ruby-identifier">message</span>(<span class="ruby-value">:error</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
+478:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -901,21 +907,21 @@ is the macro name, the rest are the parameters.
 					<div class="method-source-code"
 						id="expand-acro-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 453</span>
-453:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expandMacro</span>(<span class="ruby-identifier">prefix</span>, <span class="ruby-identifier">args</span>)
-454:       <span class="ruby-comment cmt"># Get the expanded macro from the @macroTable.</span>
-455:       <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">text</span> = <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">resolve</span>(<span class="ruby-identifier">args</span>, <span class="ruby-identifier">sourceFileInfo</span>)
-456:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">macro</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">text</span>
-457:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'undefined_macro'</span>, <span class="ruby-node">&quot;Undefined macro '#{args[0]}' called&quot;</span>)
-458:       <span class="ruby-keyword kw">end</span>
-459: 
-460:       <span class="ruby-comment cmt"># If the expanded macro is empty, we can ignore it.</span>
-461:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">==</span> <span class="ruby-value str">''</span>
-462: 
-463:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">injectMacro</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">prefix</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span>)
-464:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'macro_stack_overflow'</span>, <span class="ruby-value str">&quot;Too many nested macro calls.&quot;</span>)
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 460</span>
+460:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expandMacro</span>(<span class="ruby-identifier">prefix</span>, <span class="ruby-identifier">args</span>)
+461:       <span class="ruby-comment cmt"># Get the expanded macro from the @macroTable.</span>
+462:       <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">text</span> = <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">resolve</span>(<span class="ruby-identifier">args</span>, <span class="ruby-identifier">sourceFileInfo</span>)
+463:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">macro</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">text</span>
+464:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'undefined_macro'</span>, <span class="ruby-node">&quot;Undefined macro '#{args[0]}' called&quot;</span>)
 465:       <span class="ruby-keyword kw">end</span>
-466:     <span class="ruby-keyword kw">end</span></pre>
+466: 
+467:       <span class="ruby-comment cmt"># If the expanded macro is empty, we can ignore it.</span>
+468:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">text</span> <span class="ruby-operator">==</span> <span class="ruby-value str">''</span>
+469: 
+470:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">injectMacro</span>(<span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span>, <span class="ruby-identifier">prefix</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">text</span>)
+471:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'macro_stack_overflow'</span>, <span class="ruby-value str">&quot;Too many nested macro calls.&quot;</span>)
+472:       <span class="ruby-keyword kw">end</span>
+473:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -949,10 +955,10 @@ text buffer, the text will be returned.
 					<div class="method-source-code"
 						id="file-ame-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 334</span>
-334:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
-335:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">fileName</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@masterFile</span>
-336:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 336</span>
+336:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
+337:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">fileName</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@masterFile</span>
+338:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -969,7 +975,7 @@ text buffer, the text will be returned.
 				<div class="method-heading">
 				
 					<span class="method-name">include</span><span
-						class="method-args">(includeFileName, sfi)</span>
+						class="method-args">(includeFileName, sfi, &block)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -988,41 +994,42 @@ qualified name of the included file.
 					<div class="method-source-code"
 						id="include-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 291</span>
-291:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include</span>(<span class="ruby-identifier">includeFileName</span>, <span class="ruby-identifier">sfi</span>)
-292:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">includeFileName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">!=</span> <span class="ruby-value str">'/'</span>
-293:         <span class="ruby-identifier">pathOfCallingFile</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">dirname</span>
-294:         <span class="ruby-identifier">path</span> = <span class="ruby-identifier">pathOfCallingFile</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">?</span> <span class="ruby-value str">''</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">pathOfCallingFile</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
-295:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
-296:         <span class="ruby-comment cmt"># name relative to the including file.</span>
-297:         <span class="ruby-identifier">includeFileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">includeFileName</span>
-298:       <span class="ruby-keyword kw">end</span>
-299: 
-300:       <span class="ruby-comment cmt"># Try to dectect recursive inclusions. This will not work if files are</span>
-301:       <span class="ruby-comment cmt"># accessed via filesystem links.</span>
-302:       <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
-303:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">includeFileName</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">entry</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">fileName</span>
-304:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>,
-305:                 <span class="ruby-node">&quot;Recursive inclusion of #{includeFileName} detected&quot;</span>, <span class="ruby-identifier">sfi</span>)
-306:         <span class="ruby-keyword kw">end</span>
-307:       <span class="ruby-keyword kw">end</span>
-308: 
-309:       <span class="ruby-comment cmt"># Save @tokenBuffer in the record of the parent file.</span>
-310:       <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">1</span>] = <span class="ruby-ivar">@tokenBuffer</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-311:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-312:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-313: 
-314:       <span class="ruby-comment cmt"># Open the new file and push the handle on the @fileStack.</span>
-315:       <span class="ruby-keyword kw">begin</span>
-316:         <span class="ruby-ivar">@fileStack</span> <span class="ruby-operator">&lt;&lt;</span> [ (<span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">includeFileName</span>)), <span class="ruby-keyword kw">nil</span>, ]
-317:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{includeFileName}&quot;</span>
-318:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-319:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_include'</span>, <span class="ruby-node">&quot;Cannot open include file #{includeFileName}&quot;</span>, <span class="ruby-identifier">sfi</span>)
-320:       <span class="ruby-keyword kw">end</span>
-321: 
-322:       <span class="ruby-comment cmt"># Return the name of the included file.</span>
-323:       <span class="ruby-identifier">includeFileName</span>
-324:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 292</span>
+292:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include</span>(<span class="ruby-identifier">includeFileName</span>, <span class="ruby-identifier">sfi</span>, &amp;<span class="ruby-identifier">block</span>)
+293:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">includeFileName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">!=</span> <span class="ruby-value str">'/'</span>
+294:         <span class="ruby-identifier">pathOfCallingFile</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">dirname</span>
+295:         <span class="ruby-identifier">path</span> = <span class="ruby-identifier">pathOfCallingFile</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">?</span> <span class="ruby-value str">''</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">pathOfCallingFile</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
+296:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
+297:         <span class="ruby-comment cmt"># name relative to the including file.</span>
+298:         <span class="ruby-identifier">includeFileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">includeFileName</span>
+299:       <span class="ruby-keyword kw">end</span>
+300: 
+301:       <span class="ruby-comment cmt"># Try to dectect recursive inclusions. This will not work if files are</span>
+302:       <span class="ruby-comment cmt"># accessed via filesystem links.</span>
+303:       <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
+304:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">includeFileName</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">entry</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">fileName</span>
+305:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>,
+306:                 <span class="ruby-node">&quot;Recursive inclusion of #{includeFileName} detected&quot;</span>, <span class="ruby-identifier">sfi</span>)
+307:         <span class="ruby-keyword kw">end</span>
+308:       <span class="ruby-keyword kw">end</span>
+309: 
+310:       <span class="ruby-comment cmt"># Save @tokenBuffer in the record of the parent file.</span>
+311:       <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">1</span>] = <span class="ruby-ivar">@tokenBuffer</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
+312:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+313:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+314: 
+315:       <span class="ruby-comment cmt"># Open the new file and push the handle on the @fileStack.</span>
+316:       <span class="ruby-keyword kw">begin</span>
+317:         <span class="ruby-ivar">@fileStack</span> <span class="ruby-operator">&lt;&lt;</span> [ (<span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">includeFileName</span>)),
+318:                         <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">block</span> ]
+319:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{includeFileName}&quot;</span>
+320:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+321:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_include'</span>, <span class="ruby-node">&quot;Cannot open include file #{includeFileName}&quot;</span>, <span class="ruby-identifier">sfi</span>)
+322:       <span class="ruby-keyword kw">end</span>
+323: 
+324:       <span class="ruby-comment cmt"># Return the name of the included file.</span>
+325:       <span class="ruby-identifier">includeFileName</span>
+326:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1056,10 +1063,10 @@ added already.
 					<div class="method-source-code"
 						id="macro-efined--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 445</span>
-445:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
-446:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
-447:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 452</span>
+452:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
+453:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
+454:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1093,13 +1100,13 @@ patterns of that <em>newMode</em>.
 					<div class="method-source-code"
 						id="mode--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 252</span>
-252:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mode=</span>(<span class="ruby-identifier">newMode</span>)
-253:       <span class="ruby-comment cmt">#puts &quot;**** New mode: #{newMode}&quot;</span>
-254:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">newMode</span>]
-255:       <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Undefined mode #{newMode}&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@activePatterns</span>
-256:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-identifier">newMode</span>
-257:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 253</span>
+253:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mode=</span>(<span class="ruby-identifier">newMode</span>)
+254:       <span class="ruby-comment cmt">#puts &quot;**** New mode: #{newMode}&quot;</span>
+255:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">newMode</span>]
+256:       <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Undefined mode #{newMode}&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@activePatterns</span>
+257:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-identifier">newMode</span>
+258:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1135,81 +1142,86 @@ started.
 					<div class="method-source-code"
 						id="next-oken-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 353</span>
-353:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
-354:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
-355:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-356:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
-357:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-358:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
-359:       <span class="ruby-keyword kw">end</span>
-360: 
-361:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@finishLastFile</span>
-362:         <span class="ruby-comment cmt"># The previously processed file has now really been processed to</span>
-363:         <span class="ruby-comment cmt"># completion. Close it and remove the corresponding entry from the</span>
-364:         <span class="ruby-comment cmt"># @fileStack.</span>
-365:         <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-366:         <span class="ruby-comment cmt">#Log &lt;&lt; &quot;Completed file #{@cf.fileName}&quot;</span>
-367:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>
-368:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">pop</span>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 355</span>
+355:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
+356:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
+357:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+358:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
+359:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+360:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
+361:       <span class="ruby-keyword kw">end</span>
+362: 
+363:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@finishLastFile</span>
+364:         <span class="ruby-comment cmt"># The previously processed file has now really been processed to</span>
+365:         <span class="ruby-comment cmt"># completion. Close it and remove the corresponding entry from the</span>
+366:         <span class="ruby-comment cmt"># @fileStack.</span>
+367:         <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+368:         <span class="ruby-comment cmt">#Log &lt;&lt; &quot;Completed file #{@cf.fileName}&quot;</span>
 369: 
-370:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-371:           <span class="ruby-comment cmt"># We are done with the top-level file now.</span>
-372:           <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-373:           <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
-374:           <span class="ruby-keyword kw">return</span> [ <span class="ruby-value">:endOfText</span>, <span class="ruby-value str">'&lt;EOT&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
-375:         <span class="ruby-keyword kw">else</span>
-376:           <span class="ruby-comment cmt"># Continue parsing the file that included the current file.</span>
-377:           <span class="ruby-ivar">@cf</span>, <span class="ruby-identifier">tokenBuffer</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>
-378:           <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@cf.fileName} ...&quot;</span>
-379:           <span class="ruby-comment cmt"># If we have a left over token from previously processing this file,</span>
-380:           <span class="ruby-comment cmt"># return it now.</span>
-381:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">tokenBuffer</span>
-382:             <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">tokenBuffer</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">==</span> <span class="ruby-value">:eof</span>
-383:             <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">tokenBuffer</span>
-384:           <span class="ruby-keyword kw">end</span>
-385:         <span class="ruby-keyword kw">end</span>
-386:       <span class="ruby-keyword kw">end</span>
-387: 
-388:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
-389:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-identifier">sourceFileInfo</span>
-390:       <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-391:         <span class="ruby-identifier">match</span> = <span class="ruby-keyword kw">nil</span>
-392:         <span class="ruby-keyword kw">begin</span>
-393:           <span class="ruby-ivar">@activePatterns</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">type</span>, <span class="ruby-identifier">re</span>, <span class="ruby-identifier">postProc</span><span class="ruby-operator">|</span>
-394:             <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">match</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">scan</span>(<span class="ruby-identifier">re</span>))
-395:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span> <span class="ruby-operator">==</span> <span class="ruby-value">:scannerEOF</span>
-396:                 <span class="ruby-comment cmt"># We've found the end of an input file. Return a special token</span>
-397:                 <span class="ruby-comment cmt"># that describes the end of a file.</span>
-398:                 <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
-399:                 <span class="ruby-keyword kw">return</span> [ <span class="ruby-value">:eof</span>, <span class="ruby-value str">'&lt;END&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
-400:               <span class="ruby-keyword kw">end</span>
-401: 
-402:               <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;#{re} matches empty string&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">empty?</span>
-403:               <span class="ruby-comment cmt"># If we have a post processing method, call it now. It may modify</span>
-404:               <span class="ruby-comment cmt"># the type or the found token String.</span>
-405:               <span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span> = <span class="ruby-identifier">postProc</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">postProc</span>
-406: 
-407:               <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-comment cmt"># Ignore certain tokens with nil type.</span>
+370:         <span class="ruby-comment cmt"># If we have a block to be executed on EOF, we call it now.</span>
+371:         <span class="ruby-identifier">onEof</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">2</span>]
+372:         <span class="ruby-identifier">onEof</span>.<span class="ruby-identifier">call</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">onEof</span>
+373: 
+374:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>
+375:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">pop</span>
+376: 
+377:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
+378:           <span class="ruby-comment cmt"># We are done with the top-level file now.</span>
+379:           <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+380:           <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
+381:           <span class="ruby-keyword kw">return</span> [ <span class="ruby-value">:endOfText</span>, <span class="ruby-value str">'&lt;EOT&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
+382:         <span class="ruby-keyword kw">else</span>
+383:           <span class="ruby-comment cmt"># Continue parsing the file that included the current file.</span>
+384:           <span class="ruby-ivar">@cf</span>, <span class="ruby-identifier">tokenBuffer</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>
+385:           <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@cf.fileName} ...&quot;</span>
+386:           <span class="ruby-comment cmt"># If we have a left over token from previously processing this file,</span>
+387:           <span class="ruby-comment cmt"># return it now.</span>
+388:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">tokenBuffer</span>
+389:             <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">tokenBuffer</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">==</span> <span class="ruby-value">:eof</span>
+390:             <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">tokenBuffer</span>
+391:           <span class="ruby-keyword kw">end</span>
+392:         <span class="ruby-keyword kw">end</span>
+393:       <span class="ruby-keyword kw">end</span>
+394: 
+395:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
+396:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-identifier">sourceFileInfo</span>
+397:       <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
+398:         <span class="ruby-identifier">match</span> = <span class="ruby-keyword kw">nil</span>
+399:         <span class="ruby-keyword kw">begin</span>
+400:           <span class="ruby-ivar">@activePatterns</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">type</span>, <span class="ruby-identifier">re</span>, <span class="ruby-identifier">postProc</span><span class="ruby-operator">|</span>
+401:             <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">match</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">scan</span>(<span class="ruby-identifier">re</span>))
+402:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span> <span class="ruby-operator">==</span> <span class="ruby-value">:scannerEOF</span>
+403:                 <span class="ruby-comment cmt"># We've found the end of an input file. Return a special token</span>
+404:                 <span class="ruby-comment cmt"># that describes the end of a file.</span>
+405:                 <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
+406:                 <span class="ruby-keyword kw">return</span> [ <span class="ruby-value">:eof</span>, <span class="ruby-value str">'&lt;END&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
+407:               <span class="ruby-keyword kw">end</span>
 408: 
-409:               <span class="ruby-keyword kw">return</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span>, <span class="ruby-ivar">@startOfToken</span> ]
-410:             <span class="ruby-keyword kw">end</span>
-411:           <span class="ruby-keyword kw">end</span>
-412:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
-413:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'scan_encoding_error'</span>, <span class="ruby-identifier">$!</span>.<span class="ruby-identifier">to_s</span>)
-414:         <span class="ruby-keyword kw">end</span>
+409:               <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;#{re} matches empty string&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">empty?</span>
+410:               <span class="ruby-comment cmt"># If we have a post processing method, call it now. It may modify</span>
+411:               <span class="ruby-comment cmt"># the type or the found token String.</span>
+412:               <span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span> = <span class="ruby-identifier">postProc</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">postProc</span>
+413: 
+414:               <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-comment cmt"># Ignore certain tokens with nil type.</span>
 415: 
-416:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">nil?</span>
-417:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">eof?</span>
-418:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unexpected_eof'</span>,
-419:                   <span class="ruby-value str">&quot;Unexpected end of file found&quot;</span>)
-420:           <span class="ruby-keyword kw">else</span>
-421:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'no_token_match'</span>,
-422:                   <span class="ruby-node">&quot;Unexpected characters found: '#{@cf.peek(10)}...'&quot;</span>)
-423:           <span class="ruby-keyword kw">end</span>
-424:         <span class="ruby-keyword kw">end</span>
-425:       <span class="ruby-keyword kw">end</span>
-426:     <span class="ruby-keyword kw">end</span></pre>
+416:               <span class="ruby-keyword kw">return</span> [ <span class="ruby-identifier">type</span>, <span class="ruby-identifier">match</span>, <span class="ruby-ivar">@startOfToken</span> ]
+417:             <span class="ruby-keyword kw">end</span>
+418:           <span class="ruby-keyword kw">end</span>
+419:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
+420:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'scan_encoding_error'</span>, <span class="ruby-identifier">$!</span>.<span class="ruby-identifier">to_s</span>)
+421:         <span class="ruby-keyword kw">end</span>
+422: 
+423:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">nil?</span>
+424:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">eof?</span>
+425:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unexpected_eof'</span>,
+426:                   <span class="ruby-value str">&quot;Unexpected end of file found&quot;</span>)
+427:           <span class="ruby-keyword kw">else</span>
+428:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'no_token_match'</span>,
+429:                   <span class="ruby-node">&quot;Unexpected characters found: '#{@cf.peek(10)}...'&quot;</span>)
+430:           <span class="ruby-keyword kw">end</span>
+431:         <span class="ruby-keyword kw">end</span>
+432:       <span class="ruby-keyword kw">end</span>
+433:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1243,21 +1255,21 @@ Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
 					<div class="method-source-code"
 						id="open-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 262</span>
-262:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span>(<span class="ruby-identifier">fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>)
-263:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
-264:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
-265:         <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">BufferStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span> ] ]
-266:       <span class="ruby-keyword kw">else</span>
-267:         <span class="ruby-keyword kw">begin</span>
-268:           <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span> ] ]
-269:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-270:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'open_file'</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>)
-271:         <span class="ruby-keyword kw">end</span>
-272:       <span class="ruby-keyword kw">end</span>
-273:       <span class="ruby-ivar">@masterPath</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
-274:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-275:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 263</span>
+263:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span>(<span class="ruby-identifier">fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>)
+264:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
+265:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
+266:         <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">BufferStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
+267:       <span class="ruby-keyword kw">else</span>
+268:         <span class="ruby-keyword kw">begin</span>
+269:           <span class="ruby-ivar">@fileStack</span> = [ [ <span class="ruby-ivar">@cf</span> = <span class="ruby-constant">FileStreamHandle</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ] ]
+270:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+271:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'open_file'</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>)
+272:         <span class="ruby-keyword kw">end</span>
+273:       <span class="ruby-keyword kw">end</span>
+274:       <span class="ruby-ivar">@masterPath</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
+275:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+276:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1291,15 +1303,15 @@ token can be returned before the next nextToken() call.
 					<div class="method-source-code"
 						id="return-oken-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 430</span>
-430:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
-431:       <span class="ruby-comment cmt">#Log &lt;&lt; &quot;-&gt; Returning Token: [#{token[0]}][#{token[1]}]&quot;</span>
-432:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-433:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
-434:         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Fatal Error: Cannot return more than 1 token in a row&quot;</span>
-435:       <span class="ruby-keyword kw">end</span>
-436:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
-437:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 437</span>
+437:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
+438:       <span class="ruby-comment cmt">#Log &lt;&lt; &quot;-&gt; Returning Token: [#{token[0]}][#{token[1]}]&quot;</span>
+439:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+440:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
+441:         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Fatal Error: Cannot return more than 1 token in a row&quot;</span>
+442:       <span class="ruby-keyword kw">end</span>
+443:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
+444:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1333,11 +1345,11 @@ processing prosition.
 					<div class="method-source-code"
 						id="source-ile-nfo-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 327</span>
-327:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
-328:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">lineNo</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@lineDelta</span>, <span class="ruby-value">0</span>) <span class="ruby-operator">:</span>
-329:             <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>, <span class="ruby-value">0</span>, <span class="ruby-value">0</span>)
-330:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 329</span>
+329:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
+330:       <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">lineNo</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@lineDelta</span>, <span class="ruby-value">0</span>) <span class="ruby-operator">:</span>
+331:             <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@masterFile</span>, <span class="ruby-value">0</span>, <span class="ruby-value">0</span>)
+332:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1368,10 +1380,10 @@ processing prosition.
 					<div class="method-source-code"
 						id="warning-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 473</span>
-473:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">data</span> = <span class="ruby-keyword kw">nil</span>)
-474:       <span class="ruby-identifier">message</span>(<span class="ruby-value">:warning</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
-475:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 480</span>
+480:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">data</span> = <span class="ruby-keyword kw">nil</span>)
+481:       <span class="ruby-identifier">message</span>(<span class="ruby-value">:warning</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
+482:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1408,35 +1420,35 @@ processing prosition.
 					<div class="method-source-code"
 						id="message-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 479</span>
-479:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">message</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
-480:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
-481:         <span class="ruby-identifier">line</span> = <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">nil</span>
-482:         <span class="ruby-identifier">sfi</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">sourceFileInfo</span>
-483: 
-484:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">macroStack</span>.<span class="ruby-identifier">empty?</span>
-485:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'Macro call history:'</span>, <span class="ruby-keyword kw">nil</span>)
-486: 
-487:           <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">macroStack</span>.<span class="ruby-identifier">reverse_each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
-488:             <span class="ruby-identifier">macro</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">macro</span>
-489:             <span class="ruby-identifier">args</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">args</span>[<span class="ruby-value">1</span><span class="ruby-operator">..</span><span class="ruby-value">1</span>]
-490:             <span class="ruby-identifier">args</span>.<span class="ruby-identifier">collect!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-value str">'&quot;'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">a</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'&quot;'</span> }
-491:             <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">'macro_stack'</span>,
-492:                                  <span class="ruby-node">&quot;  ${#{macro.name} #{args.join(' ')}}&quot;</span>,
-493:                                  <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
-494:           <span class="ruby-keyword kw">end</span>
-495:         <span class="ruby-keyword kw">end</span>
-496: 
-497:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">type</span>
-498:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:error</span>
-499:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">line</span>, <span class="ruby-identifier">data</span>)
-500:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:warning</span>
-501:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">line</span>, <span class="ruby-identifier">data</span>)
-502:         <span class="ruby-keyword kw">else</span>
-503:           <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown message type #{type}&quot;</span>
-504:         <span class="ruby-keyword kw">end</span>
-505:       <span class="ruby-keyword kw">end</span>
-506:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 486</span>
+486:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">message</span>(<span class="ruby-identifier">type</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">data</span>)
+487:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
+488:         <span class="ruby-identifier">line</span> = <span class="ruby-ivar">@cf</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> <span class="ruby-operator">:</span> <span class="ruby-keyword kw">nil</span>
+489:         <span class="ruby-identifier">sfi</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">sourceFileInfo</span>
+490: 
+491:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">macroStack</span>.<span class="ruby-identifier">empty?</span>
+492:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'Macro call history:'</span>, <span class="ruby-keyword kw">nil</span>)
+493: 
+494:           <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">macroStack</span>.<span class="ruby-identifier">reverse_each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">entry</span><span class="ruby-operator">|</span>
+495:             <span class="ruby-identifier">macro</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">macro</span>
+496:             <span class="ruby-identifier">args</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">args</span>[<span class="ruby-value">1</span><span class="ruby-operator">..</span><span class="ruby-value">1</span>]
+497:             <span class="ruby-identifier">args</span>.<span class="ruby-identifier">collect!</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-value str">'&quot;'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">a</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'&quot;'</span> }
+498:             <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">'macro_stack'</span>,
+499:                                  <span class="ruby-node">&quot;  ${#{macro.name} #{args.join(' ')}}&quot;</span>,
+500:                                  <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
+501:           <span class="ruby-keyword kw">end</span>
+502:         <span class="ruby-keyword kw">end</span>
+503: 
+504:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">type</span>
+505:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:error</span>
+506:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">line</span>, <span class="ruby-identifier">data</span>)
+507:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:warning</span>
+508:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">sfi</span>, <span class="ruby-identifier">line</span>, <span class="ruby-identifier">data</span>)
+509:         <span class="ruby-keyword kw">else</span>
+510:           <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown message type #{type}&quot;</span>
+511:         <span class="ruby-keyword kw">end</span>
+512:       <span class="ruby-keyword kw">end</span>
+513:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>