taskjuggler 0.0.7 → 0.0.8

data/doc/TaskJuggler/TextParser/TextParserResultArray.html

@@ -151,12 +151,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -263,7 +269,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -443,6 +449,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -551,7 +561,8 @@
 		<div id="description">
 			<p>
 Utility class so that we can distinguish Array results from the Array
-containing the results of a repeatable rule.
+containing the results of a repeatable rule. We define some merging method
+with a slightly different behaviour.
 </p>
 
 		</div>
@@ -588,10 +599,10 @@ containing the results of a repeatable rule.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/TextParser.rb, line 50</span>
-50:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
-51:         <span class="ruby-keyword kw">super</span>
-52:       <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/TextParser.rb, line 57</span>
+57:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
+58:         <span class="ruby-keyword kw">super</span>
+59:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -633,14 +644,14 @@ Array.
 					<div class="method-source-code"
 						id="--source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/TextParser.rb, line 58</span>
-58:       <span class="ruby-keyword kw">def</span> <span class="ruby-operator">&lt;&lt;</span>(<span class="ruby-identifier">arg</span>)
-59:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">TextParserResultArray</span>)
-60:           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">concat</span>(<span class="ruby-identifier">arg</span>)
-61:         <span class="ruby-keyword kw">else</span>
-62:           <span class="ruby-keyword kw">super</span>
-63:         <span class="ruby-keyword kw">end</span>
-64:       <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/TextParser.rb, line 65</span>
+65:       <span class="ruby-keyword kw">def</span> <span class="ruby-operator">&lt;&lt;</span>(<span class="ruby-identifier">arg</span>)
+66:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">TextParserResultArray</span>)
+67:           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">concat</span>(<span class="ruby-identifier">arg</span>)
+68:         <span class="ruby-keyword kw">else</span>
+69:           <span class="ruby-keyword kw">super</span>
+70:         <span class="ruby-keyword kw">end</span>
+71:       <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>

data/doc/TaskJuggler/TextParser/TokenDoc.html

@@ -149,12 +149,18 @@
 				
 					<li><a href="../../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -261,7 +267,7 @@
 				
 					<li><a href="../../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -441,6 +447,10 @@
 				
 					<li><a href="../../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/TextReport.html

@@ -155,12 +155,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -267,7 +273,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -447,6 +453,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/TextScanner.html

@@ -194,12 +194,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -306,7 +312,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -486,6 +492,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -643,46 +653,46 @@ messages.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 186</span>
-186:     <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>)
-187:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
-188:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
-189:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
-190:       <span class="ruby-comment cmt"># text.</span>
-191:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
-192:       <span class="ruby-comment cmt"># The currently processed IO object.</span>
-193:       <span class="ruby-ivar">@cf</span> = <span class="ruby-keyword kw">nil</span>
-194:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
-195:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 2 elements, the IO object and</span>
-196:       <span class="ruby-comment cmt"># the @tokenBuffer.</span>
-197:       <span class="ruby-ivar">@fileStack</span> = []
-198:       <span class="ruby-comment cmt"># This flag is set if we have reached the end of a file. Since we will</span>
-199:       <span class="ruby-comment cmt"># only know when the next new token is requested that the file is really</span>
-200:       <span class="ruby-comment cmt"># done now, we have to use this flag.</span>
-201:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-202:       <span class="ruby-comment cmt"># True if the scanner operates on a buffer.</span>
-203:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
-204:       <span class="ruby-comment cmt"># A SourceFileInfo of the start of the currently processed token.</span>
-205:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-keyword kw">nil</span>
-206:       <span class="ruby-comment cmt"># Line number correction for error messages.</span>
-207:       <span class="ruby-ivar">@lineDelta</span> = <span class="ruby-value">0</span>
-208:       <span class="ruby-comment cmt"># Lists of regexps that describe the detectable tokens. The Arrays are</span>
-209:       <span class="ruby-comment cmt"># grouped by mode.</span>
-210:       <span class="ruby-ivar">@patternsByMode</span> = { }
-211:       <span class="ruby-comment cmt"># The currently active scanner mode.</span>
-212:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-keyword kw">nil</span>
-213:       <span class="ruby-comment cmt"># Points to the currently active pattern set as defined by the mode.</span>
-214:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-keyword kw">nil</span>
-215: 
-216:       <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>
-217:         <span class="ruby-identifier">type</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">0</span>]
-218:         <span class="ruby-identifier">regExp</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">1</span>]
-219:         <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>
-220:         <span class="ruby-identifier">postProc</span> = <span class="ruby-identifier">pat</span>[<span class="ruby-value">3</span>]
-221:         <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>)
-222:       <span class="ruby-keyword kw">end</span>
-223:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">mode</span> = <span class="ruby-identifier">defaultMode</span>
-224:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -721,10 +731,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 436</span>
-436:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
-437:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
-438:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -765,20 +775,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 234</span>
-234:     <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>)
-235:       <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>)
-236:         <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>
-237:           <span class="ruby-comment cmt"># The pattern is active in multiple modes</span>
-238:           <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>)
-239:           <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> ]
-240:         <span class="ruby-keyword kw">end</span>
-241:       <span class="ruby-keyword kw">else</span>
-242:         <span class="ruby-comment cmt"># The pattern is only active in one specific mode.</span>
-243:         <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>)
-244:         <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> ]
-245:       <span class="ruby-keyword kw">end</span>
-246:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -811,15 +821,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 276</span>
-276:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-277:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
-278:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
-279:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
-280:       <span class="ruby-keyword kw">end</span>
-281:       <span class="ruby-ivar">@fileStack</span> = []
-282:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-283:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -852,10 +862,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 465</span>
-465:     <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>)
-466:       <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>)
-467:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -891,21 +901,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 449</span>
-449:     <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>)
-450:       <span class="ruby-comment cmt"># Get the expanded macro from the @macroTable.</span>
-451:       <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>)
-452:       <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>
-453:         <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>)
-454:       <span class="ruby-keyword kw">end</span>
-455: 
-456:       <span class="ruby-comment cmt"># If the expanded macro is empty, we can ignore it.</span>
-457:       <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>
-458: 
-459:       <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>)
-460:         <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>)
-461:       <span class="ruby-keyword kw">end</span>
-462:     <span class="ruby-keyword kw">end</span></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>)
+465:       <span class="ruby-keyword kw">end</span>
+466:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -939,10 +949,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 332</span>
-332:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
-333:       <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>
-334:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -978,41 +988,41 @@ 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 289</span>
-289:     <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>)
-290:       <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>
-291:         <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>
-292:         <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>
-293:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
-294:         <span class="ruby-comment cmt"># name relative to the including file.</span>
-295:         <span class="ruby-identifier">includeFileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">includeFileName</span>
-296:       <span class="ruby-keyword kw">end</span>
-297: 
-298:       <span class="ruby-comment cmt"># Try to dectect recursive inclusions. This will not work if files are</span>
-299:       <span class="ruby-comment cmt"># accessed via filesystem links.</span>
-300:       <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>
-301:         <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>
-302:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>,
-303:                 <span class="ruby-node">&quot;Recursive inclusion of #{includeFileName} detected&quot;</span>, <span class="ruby-identifier">sfi</span>)
-304:         <span class="ruby-keyword kw">end</span>
-305:       <span class="ruby-keyword kw">end</span>
-306: 
-307:       <span class="ruby-comment cmt"># Save @tokenBuffer in the record of the parent file.</span>
-308:       <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>
-309:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-310:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-311: 
-312:       <span class="ruby-comment cmt"># Open the new file and push the handle on the @fileStack.</span>
-313:       <span class="ruby-keyword kw">begin</span>
-314:         <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>, ]
-315:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{includeFileName}&quot;</span>
-316:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-317:         <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>)
-318:       <span class="ruby-keyword kw">end</span>
-319: 
-320:       <span class="ruby-comment cmt"># Return the name of the included file.</span>
-321:       <span class="ruby-identifier">includeFileName</span>
-322:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1046,10 +1056,10 @@ added already.
 					<div class="method-source-code"
 						id="macro-efined--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 441</span>
-441:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
-442:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
-443:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1074,8 +1084,8 @@ added already.
 				<div class="method-description">
 					
 					<p>
-Switch the parser to another mode. The scanner will then only detect with
-pattens of that <em>newMode</em>.
+Switch the parser to another mode. The scanner will then only detect
+patterns of that <em>newMode</em>.
 </p>
 					
 
@@ -1083,13 +1093,13 @@ pattens of that <em>newMode</em>.
 					<div class="method-source-code"
 						id="mode--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 250</span>
-250:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mode=</span>(<span class="ruby-identifier">newMode</span>)
-251:       <span class="ruby-comment cmt">#puts &quot;**** New mode: #{newMode}&quot;</span>
-252:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">newMode</span>]
-253:       <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>
-254:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-identifier">newMode</span>
-255:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1125,79 +1135,81 @@ started.
 					<div class="method-source-code"
 						id="next-oken-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 351</span>
-351:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
-352:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
-353:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-354:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
-355:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-356:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
-357:       <span class="ruby-keyword kw">end</span>
-358: 
-359:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@finishLastFile</span>
-360:         <span class="ruby-comment cmt"># The previously processed file has now really been processed to</span>
-361:         <span class="ruby-comment cmt"># completion. Close it and remove the corresponding entry from the</span>
-362:         <span class="ruby-comment cmt"># @fileStack.</span>
-363:         <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
-364:         <span class="ruby-comment cmt">#Log &lt;&lt; &quot;Completed file #{@cf.fileName}&quot;</span>
-365:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">close</span>
-366:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">pop</span>
-367: 
-368:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-369:           <span class="ruby-comment cmt"># We are done with the top-level file now.</span>
-370:           <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-371:           <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
-372:           <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'&lt;END&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
-373:         <span class="ruby-keyword kw">else</span>
-374:           <span class="ruby-comment cmt"># Continue parsing the file that included the current file.</span>
-375:           <span class="ruby-ivar">@cf</span>, <span class="ruby-identifier">tokenBuffer</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>
-376:           <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@cf.fileName} ...&quot;</span>
-377:           <span class="ruby-comment cmt"># If we have a left over token from previously processing this file,</span>
-378:           <span class="ruby-comment cmt"># return it now.</span>
-379:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">tokenBuffer</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">tokenBuffer</span>
-380:         <span class="ruby-keyword kw">end</span>
-381:       <span class="ruby-keyword kw">end</span>
-382: 
-383:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
-384:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-identifier">sourceFileInfo</span>
-385:       <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-386:         <span class="ruby-identifier">match</span> = <span class="ruby-keyword kw">nil</span>
-387:         <span class="ruby-keyword kw">begin</span>
-388:           <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>
-389:             <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>))
-390:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span> <span class="ruby-operator">==</span> <span class="ruby-value">:scannerEOF</span>
-391:                 <span class="ruby-comment cmt"># We've found the end of an input file. Return a special token</span>
-392:                 <span class="ruby-comment cmt"># that describes the end of a file.</span>
-393:                 <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
-394:                 <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'&lt;END&gt;'</span>, <span class="ruby-ivar">@startOfToken</span> ]
-395:               <span class="ruby-keyword kw">end</span>
-396: 
-397:               <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>
-398:               <span class="ruby-comment cmt"># If we have a post processing method, call it now. It may modify</span>
-399:               <span class="ruby-comment cmt"># the type or the found token String.</span>
-400:               <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>
+     <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>
+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-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>
-403: 
-404:               <span class="ruby-comment cmt">#puts &quot;type: #{type}  match: [#{match}]&quot;</span>
-405:               <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> ]
-406:             <span class="ruby-keyword kw">end</span>
-407:           <span class="ruby-keyword kw">end</span>
-408:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
-409:           <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>)
-410:         <span class="ruby-keyword kw">end</span>
-411: 
-412:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">nil?</span>
-413:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">eof?</span>
-414:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unexpected_eof'</span>,
-415:                   <span class="ruby-value str">&quot;Unexpected end of file found&quot;</span>)
-416:           <span class="ruby-keyword kw">else</span>
-417:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'no_token_match'</span>,
-418:                   <span class="ruby-node">&quot;Unexpected characters found: '#{@cf.peek(10)}...'&quot;</span>)
-419:           <span class="ruby-keyword kw">end</span>
-420:         <span class="ruby-keyword kw">end</span>
-421:       <span class="ruby-keyword kw">end</span>
-422:     <span class="ruby-keyword kw">end</span></pre>
+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>
+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>
+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>
 					</div>
 					
 				</div>
@@ -1231,21 +1243,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 260</span>
-260:     <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>)
-261:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
-262:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
-263:         <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> ] ]
-264:       <span class="ruby-keyword kw">else</span>
-265:         <span class="ruby-keyword kw">begin</span>
-266:           <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> ] ]
-267:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-268:           <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>)
-269:         <span class="ruby-keyword kw">end</span>
-270:       <span class="ruby-keyword kw">end</span>
-271:       <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>
-272:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-273:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1279,15 +1291,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 426</span>
-426:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
-427:       <span class="ruby-comment cmt">#Log &lt;&lt; &quot;-&gt; Returning Token: [#{token[0]}][#{token[1]}]&quot;</span>
-428:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-429:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
-430:         <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>
-431:       <span class="ruby-keyword kw">end</span>
-432:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
-433:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1321,11 +1333,11 @@ processing prosition.
 					<div class="method-source-code"
 						id="source-ile-nfo-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 325</span>
-325:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
-326:       <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>
-327:             <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>)
-328:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>
@@ -1356,10 +1368,10 @@ processing prosition.
 					<div class="method-source-code"
 						id="warning-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">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>)
-470:       <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-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>, <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 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>
 					</div>
 					
 				</div>
@@ -1396,35 +1408,35 @@ processing prosition.
 					<div class="method-source-code"
 						id="message-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 475</span>
-475:     <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>)
-476:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
-477:         <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>
-478:         <span class="ruby-identifier">sfi</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">sourceFileInfo</span>
-479: 
-480:         <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>
-481:           <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>)
-482: 
-483:           <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>
-484:             <span class="ruby-identifier">macro</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">macro</span>
-485:             <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>]
-486:             <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> }
-487:             <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">'macro_stack'</span>,
-488:                                  <span class="ruby-node">&quot;  ${#{macro.name} #{args.join(' ')}}&quot;</span>,
-489:                                  <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
-490:           <span class="ruby-keyword kw">end</span>
-491:         <span class="ruby-keyword kw">end</span>
-492: 
-493:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">type</span>
-494:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:error</span>
-495:           <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>)
-496:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">:warning</span>
-497:           <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>)
-498:         <span class="ruby-keyword kw">else</span>
-499:           <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown message type #{type}&quot;</span>
-500:         <span class="ruby-keyword kw">end</span>
-501:       <span class="ruby-keyword kw">end</span>
-502:     <span class="ruby-keyword kw">end</span></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>
 					</div>
 					
 				</div>