taskjuggler 0.0.5 → 0.0.6

data/doc/TaskJuggler/TextScanner.html

@@ -70,6 +70,8 @@
 					
 					<li><span class="type">CLASS</span> <a href="TextScanner/FileStreamHandle.html">TaskJuggler::TextScanner::FileStreamHandle</a></li>
 					
+					<li><span class="type">CLASS</span> <a href="TextScanner/MacroStackEntry.html">TaskJuggler::TextScanner::MacroStackEntry</a></li>
+					
 					<li><span class="type">CLASS</span> <a href="TextScanner/StreamHandle.html">TaskJuggler::TextScanner::StreamHandle</a></li>
 					
 				</ul>
@@ -82,67 +84,37 @@
 				<h3 class="section-header">Methods</h3>
 				<ul class="link-list">
 					
-					<li><a href="#M001128">::new</a></li>
-					
-					<li><a href="#M001139">#addMacro</a></li>
-					
-					<li><a href="#M001130">#close</a></li>
-					
-					<li><a href="#M001142">#error</a></li>
-					
-					<li><a href="#M001161">#errorEOF</a></li>
-					
-					<li><a href="#M001141">#expandMacro</a></li>
-					
-					<li><a href="#M001133">#fileName</a></li>
-					
-					<li><a href="#M001150">#handleDash</a></li>
-					
-					<li><a href="#M001131">#include</a></li>
-					
-					<li><a href="#M001140">#macroDefined?</a></li>
-					
-					<li><a href="#M001144">#message</a></li>
-					
-					<li><a href="#M001145">#nextChar</a></li>
-					
-					<li><a href="#M001146">#nextCharI</a></li>
-					
-					<li><a href="#M001137">#nextToken</a></li>
-					
-					<li><a href="#M001129">#open</a></li>
-					
-					<li><a href="#M001151">#readBlanks</a></li>
+					<li><a href="#method-c-new">::new</a></li>
 					
-					<li><a href="#M001153">#readDate</a></li>
+					<li><a href="#method-i-addMacro">#addMacro</a></li>
 					
-					<li><a href="#M001159">#readDigits</a></li>
+					<li><a href="#method-i-addPattern">#addPattern</a></li>
 					
-					<li><a href="#M001156">#readId</a></li>
+					<li><a href="#method-i-close">#close</a></li>
 					
-					<li><a href="#M001160">#readIdentifier</a></li>
+					<li><a href="#method-i-error">#error</a></li>
 					
-					<li><a href="#M001155">#readIndentedString</a></li>
+					<li><a href="#method-i-expandMacro">#expandMacro</a></li>
 					
-					<li><a href="#M001157">#readMacro</a></li>
+					<li><a href="#method-i-fileName">#fileName</a></li>
 					
-					<li><a href="#M001152">#readNumber</a></li>
+					<li><a href="#method-i-include">#include</a></li>
 					
-					<li><a href="#M001158">#readOperator</a></li>
+					<li><a href="#method-i-macroDefined%3F">#macroDefined?</a></li>
 					
-					<li><a href="#M001154">#readString</a></li>
+					<li><a href="#method-i-message">#message</a></li>
 					
-					<li><a href="#M001147">#returnChar</a></li>
+					<li><a href="#method-i-mode%3D">#mode=</a></li>
 					
-					<li><a href="#M001138">#returnToken</a></li>
+					<li><a href="#method-i-nextToken">#nextToken</a></li>
 					
-					<li><a href="#M001149">#skipCPlusPlusComments</a></li>
+					<li><a href="#method-i-open">#open</a></li>
 					
-					<li><a href="#M001148">#skipComment</a></li>
+					<li><a href="#method-i-returnToken">#returnToken</a></li>
 					
-					<li><a href="#M001132">#sourceFileInfo</a></li>
+					<li><a href="#method-i-sourceFileInfo">#sourceFileInfo</a></li>
 					
-					<li><a href="#M001143">#warning</a></li>
+					<li><a href="#method-i-warning">#warning</a></li>
 					
 				</ul>
 			</div>
@@ -159,6 +131,8 @@
 				<h3 class="section-header">Files</h3>
 				<ul>
 				
+					<li class="file"><a href="../CHANGELOG.html">CHANGELOG</a></li>
+				
 					<li class="file"><a href="../COPYING.html">COPYING</a></li>
 				
 					<li class="file"><a href="../README.html">README</a></li>
@@ -328,6 +302,8 @@
 				
 					<li><a href="../TaskJuggler/NikuResource.html">TaskJuggler::NikuResource</a></li>
 				
+					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
+				
 					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
@@ -342,6 +318,8 @@
 				
 					<li><a href="../TaskJuggler/ProjectFileParser.html">TaskJuggler::ProjectFileParser</a></li>
 				
+					<li><a href="../TaskJuggler/ProjectFileScanner.html">TaskJuggler::ProjectFileScanner</a></li>
+				
 					<li><a href="../TaskJuggler/ProjectRecord.html">TaskJuggler::ProjectRecord</a></li>
 				
 					<li><a href="../TaskJuggler/ProjectServer.html">TaskJuggler::ProjectServer</a></li>
@@ -358,12 +336,16 @@
 				
 					<li><a href="../TaskJuggler/Query.html">TaskJuggler::Query</a></li>
 				
+					<li><a href="../TaskJuggler/RTFHandlers.html">TaskJuggler::RTFHandlers</a></li>
+				
 					<li><a href="../TaskJuggler/RTFNavigator.html">TaskJuggler::RTFNavigator</a></li>
 				
 					<li><a href="../TaskJuggler/RTFQuery.html">TaskJuggler::RTFQuery</a></li>
 				
 					<li><a href="../TaskJuggler/RTFReport.html">TaskJuggler::RTFReport</a></li>
 				
+					<li><a href="../TaskJuggler/RTFReportLink.html">TaskJuggler::RTFReportLink</a></li>
+				
 					<li><a href="../TaskJuggler/RealFormat.html">TaskJuggler::RealFormat</a></li>
 				
 					<li><a href="../TaskJuggler/RealFormatAttribute.html">TaskJuggler::RealFormatAttribute</a></li>
@@ -382,6 +364,8 @@
 				
 					<li><a href="../TaskJuggler/ReportServerRecord.html">TaskJuggler::ReportServerRecord</a></li>
 				
+					<li><a href="../TaskJuggler/ReportServlet.html">TaskJuggler::ReportServlet</a></li>
+				
 					<li><a href="../TaskJuggler/ReportTable.html">TaskJuggler::ReportTable</a></li>
 				
 					<li><a href="../TaskJuggler/ReportTableCell.html">TaskJuggler::ReportTableCell</a></li>
@@ -510,6 +494,8 @@
 				
 					<li><a href="../TaskJuggler/TextScanner/FileStreamHandle.html">TaskJuggler::TextScanner::FileStreamHandle</a></li>
 				
+					<li><a href="../TaskJuggler/TextScanner/MacroStackEntry.html">TaskJuggler::TextScanner::MacroStackEntry</a></li>
+				
 					<li><a href="../TaskJuggler/TextScanner/StreamHandle.html">TaskJuggler::TextScanner::StreamHandle</a></li>
 				
 					<li><a href="../TaskJuggler/TimeSheet.html">TaskJuggler::TimeSheet</a></li>
@@ -554,8 +540,12 @@
 				
 					<li><a href="../TaskJuggler/TjpSyntaxRules.html">TaskJuggler::TjpSyntaxRules</a></li>
 				
+					<li><a href="../TaskJuggler/URLParameter.html">TaskJuggler::URLParameter</a></li>
+				
 					<li><a href="../TaskJuggler/UserManual.html">TaskJuggler::UserManual</a></li>
 				
+					<li><a href="../TaskJuggler/WebServer.html">TaskJuggler::WebServer</a></li>
+				
 					<li><a href="../TaskJuggler/WorkingHours.html">TaskJuggler::WorkingHours</a></li>
 				
 					<li><a href="../TaskJuggler/WorkingHoursAttribute.html">TaskJuggler::WorkingHoursAttribute</a></li>
@@ -582,6 +572,8 @@
 				
 					<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>
@@ -595,9 +587,13 @@
 
 		<div id="description">
 			<p>
-The <a href="TextScanner.html">TextScanner</a> class can scan text files
-and chop then into tokens to be used by a parser. Files can be nested. A
-file can include an other file.
+The <a href="TextScanner.html">TextScanner</a> class is an abstract text
+scanner with support for nested include files and text macros. The
+tokenizer will operate on rules that must be provided by a derived class.
+The scanner is modal. Each mode operates only with the subset of token
+patterns that are assigned to the current mode. The current line is tracked
+accurately and can be used for error reporting. The scanner can operate on
+Strings or Files.
 </p>
 
 		</div>
@@ -615,7 +611,7 @@ file can include an other file.
 
 		
 			<div id="new-method" class="method-detail ">
-				<a name="M001128"></a>
+				<a name="method-c-new"></a>
 
 				<div class="method-heading">
 				
@@ -641,24 +637,37 @@ messages.
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 158</span>
-158:     <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>)
-159:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
-160:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
-161:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
-162:       <span class="ruby-comment cmt"># text.</span>
-163:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
-164:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
-165:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 3 elements, the @cf,</span>
-166:       <span class="ruby-comment cmt"># @tokenBuffer and the @pos of the file.</span>
-167:       <span class="ruby-ivar">@fileStack</span> = []
-168:       <span class="ruby-comment cmt"># This Array stores the currently processed nested macros.</span>
-169:       <span class="ruby-ivar">@macroStack</span> = []
-170:       <span class="ruby-comment cmt"># In certain situation we want to ignore Macro replacement and this flag</span>
-171:       <span class="ruby-comment cmt"># is set to true.</span>
-172:       <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
-173:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
-174:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 187</span>
+187:     <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>)
+188:       <span class="ruby-ivar">@masterFile</span> = <span class="ruby-identifier">masterFile</span>
+189:       <span class="ruby-ivar">@messageHandler</span> = <span class="ruby-identifier">messageHandler</span>
+190:       <span class="ruby-comment cmt"># This table contains all macros that may be expanded when found in the</span>
+191:       <span class="ruby-comment cmt"># text.</span>
+192:       <span class="ruby-ivar">@macroTable</span> = <span class="ruby-constant">MacroTable</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">messageHandler</span>)
+193:       <span class="ruby-comment cmt"># The currently processed IO object.</span>
+194:       <span class="ruby-ivar">@cf</span> = <span class="ruby-keyword kw">nil</span>
+195:       <span class="ruby-comment cmt"># This Array stores the currently processed nested files. It's an Array</span>
+196:       <span class="ruby-comment cmt"># of Arrays. The nested Array consists of 2 elements, the IO object and</span>
+197:       <span class="ruby-comment cmt"># the @tokenBuffer.</span>
+198:       <span class="ruby-ivar">@fileStack</span> = []
+199:       <span class="ruby-comment cmt"># This flag is set if we have reached the end of a file. Since we will</span>
+200:       <span class="ruby-comment cmt"># only know when the next new token is requested that the file is really</span>
+201:       <span class="ruby-comment cmt"># done now, we have to use this flag.</span>
+202:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+203:       <span class="ruby-comment cmt"># True if the scanner operates on a buffer.</span>
+204:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>
+205:       <span class="ruby-comment cmt"># A SourceFileInfo of the start of the currently processed token.</span>
+206:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-keyword kw">nil</span>
+207:       <span class="ruby-comment cmt"># Line number correction for error messages.</span>
+208:       <span class="ruby-ivar">@lineDelta</span> = <span class="ruby-value">0</span>
+209:       <span class="ruby-comment cmt"># Lists of regexps that describe the detectable tokens. The Arrays are</span>
+210:       <span class="ruby-comment cmt"># grouped by mode.</span>
+211:       <span class="ruby-ivar">@patternsByMode</span> = { }
+212:       <span class="ruby-comment cmt"># The currently active scanner mode.</span>
+213:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-keyword kw">nil</span>
+214:       <span class="ruby-comment cmt"># Points to the currently active pattern set as defined by the mode.</span>
+215:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-keyword kw">nil</span>
+216:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -676,7 +685,7 @@ messages.
 
 		
 			<div id="add-acro-method" class="method-detail ">
-				<a name="M001139"></a>
+				<a name="method-i-addMacro"></a>
 
 				<div class="method-heading">
 				
@@ -697,10 +706,64 @@ 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 347</span>
-347:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
-348:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
-349:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 424</span>
+424:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">addMacro</span>(<span class="ruby-identifier">macro</span>)
+425:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">macro</span>)
+426:     <span class="ruby-keyword kw">end</span></pre>
+					</div>
+					
+				</div>
+
+				
+
+				
+			</div>
+
+		
+			<div id="add-attern-method" class="method-detail ">
+				<a name="method-i-addPattern"></a>
+
+				<div class="method-heading">
+				
+					<span class="method-name">addPattern</span><span
+						class="method-args">(type, regExp, mode, postProc = nil)</span>
+					<span class="method-click-advice">click to toggle source</span>
+				
+				</div>
+
+				<div class="method-description">
+					
+					<p>
+Add a new pattern to the scanner. <em>type</em> is either nil for tokens
+that will be ignored, or some identifier that will be returned with each
+token of this type. <em>regExp</em> is the RegExp that describes the token.
+<em>mode</em> identifies the scanner mode where the pattern is active. If
+it&#8217;s only a single mode, <em>mode</em> specifies the mode directly.
+For multiple modes, it&#8217;s an Array of modes.  <em>postProc</em> is a
+method reference. This method is called after the token has been detected.
+The method gets the type and the matching <a
+href="../String.html">String</a> and returns them again in an Array.
+</p>
+					
+
+					
+					<div class="method-source-code"
+						id="add-attern-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 226</span>
+226:     <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>)
+227:       <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>)
+228:         <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>
+229:           <span class="ruby-comment cmt"># The pattern is active in multiple modes</span>
+230:           <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>)
+231:           <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> ]
+232:         <span class="ruby-keyword kw">end</span>
+233:       <span class="ruby-keyword kw">else</span>
+234:         <span class="ruby-comment cmt"># The pattern is only active in one specific mode.</span>
+235:         <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>)
+236:         <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> ]
+237:       <span class="ruby-keyword kw">end</span>
+238:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -712,7 +775,7 @@ Add a <a href="Macro.html">Macro</a> to the macro translation table.
 
 		
 			<div id="close-method" class="method-detail ">
-				<a name="M001130"></a>
+				<a name="method-i-close"></a>
 
 				<div class="method-heading">
 				
@@ -733,15 +796,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 194</span>
-194:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-195:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
-196:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
-197:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
-198:       <span class="ruby-keyword kw">end</span>
-199:       <span class="ruby-ivar">@fileStack</span> = []
-200:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-201:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 268</span>
+268:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+269:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@fileNameIsBuffer</span>
+270:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">startProgressMeter</span>(<span class="ruby-node">&quot;Reading file #{@masterFile}&quot;</span>)
+271:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">stopProgressMeter</span>
+272:       <span class="ruby-keyword kw">end</span>
+273:       <span class="ruby-ivar">@fileStack</span> = []
+274:       <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+275:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -753,12 +816,12 @@ Finish processing and reset all data structures.
 
 		
 			<div id="error-method" class="method-detail ">
-				<a name="M001142"></a>
+				<a name="method-i-error"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">error</span><span
-						class="method-args">(id, text, property = nil)</span>
+						class="method-args">(id, text, property = nil, sfi = nil)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -774,10 +837,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 373</span>
-373:     <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">property</span> = <span class="ruby-keyword kw">nil</span>)
-374:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'error'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
-375:     <span class="ruby-keyword kw">end</span></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">error</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>)
+450:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'error'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>, <span class="ruby-identifier">sfi</span>)
+451:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -789,41 +852,41 @@ Call this function to report any errors related to the parsed input.
 
 		
 			<div id="expand-acro-method" class="method-detail ">
-				<a name="M001141"></a>
+				<a name="method-i-expandMacro"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">expandMacro</span><span
-						class="method-args">(args)</span>
+						class="method-args">(prefix, args)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
 
 				<div class="method-description">
 					
-					
+					<p>
+Expand a macro and inject it into the input stream. <em>prefix</em> is any
+string that was found right before the macro call. We have to inject it
+before the expanded macro. <em>args</em> is an Array of Strings. The first
+is the macro name, the rest are the parameters.
+</p>
 					
 
 					
 					<div class="method-source-code"
 						id="expand-acro-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 356</span>
-356:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expandMacro</span>(<span class="ruby-identifier">args</span>)
-357:       <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>)
-358:       <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>
-359: 
-360:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">length</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">20</span>
-361:         <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>)
-362:       <span class="ruby-keyword kw">end</span>
-363:       <span class="ruby-ivar">@macroStack</span> <span class="ruby-operator">&lt;&lt;</span> [ <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> ]
-364:       <span class="ruby-comment cmt"># Mark end of macro with a 0 element</span>
-365:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value">0</span>
-366:       <span class="ruby-identifier">text</span>.<span class="ruby-identifier">reverse</span>.<span class="ruby-identifier">each_utf8_char</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span>
-367:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-368:       <span class="ruby-keyword kw">end</span>
-369:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> = <span class="ruby-value str">''</span>
-370:     <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">expandMacro</span>(<span class="ruby-identifier">prefix</span>, <span class="ruby-identifier">args</span>)
+438:       <span class="ruby-comment cmt"># Get the expanded macro from the @macroTable.</span>
+439:       <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>)
+440:       <span class="ruby-comment cmt"># If the expanded macro is empty, we can ignore it.</span>
+441:       <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>
+442: 
+443:       <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>)
+444:         <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>)
+445:       <span class="ruby-keyword kw">end</span>
+446:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -835,7 +898,7 @@ Call this function to report any errors related to the parsed input.
 
 		
 			<div id="file-ame-method" class="method-detail ">
-				<a name="M001133"></a>
+				<a name="method-i-fileName"></a>
 
 				<div class="method-heading">
 				
@@ -857,10 +920,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 247</span>
-247:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
-248:       <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>
-249:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 321</span>
+321:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fileName</span>
+322:       <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>
+323:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -872,12 +935,12 @@ text buffer, the text will be returned.
 
 		
 			<div id="include-method" class="method-detail ">
-				<a name="M001131"></a>
+				<a name="method-i-include"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">include</span><span
-						class="method-args">(fileName)</span>
+						class="method-args">(includeFileName, sfi)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -885,9 +948,9 @@ text buffer, the text will be returned.
 				<div class="method-description">
 					
 					<p>
-Continue processing with a new file specified by <em>fileName</em>. When
-this file is finished, we will continue in the old file after the location
-where we started with the new file.
+Continue processing with a new file specified by <em>includeFileName</em>.
+When this file is finished, we will continue in the old file after the
+location where we started with the new file.
 </p>
 					
 
@@ -895,40 +958,39 @@ where we started with the new file.
 					<div class="method-source-code"
 						id="include-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 206</span>
-206:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include</span>(<span class="ruby-identifier">fileName</span>)
-207:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">!=</span> <span class="ruby-value str">'/'</span>
-208:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-209:           <span class="ruby-identifier">path</span> = <span class="ruby-ivar">@masterPath</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'./'</span> <span class="ruby-operator">?</span> <span class="ruby-value str">''</span> <span class="ruby-operator">:</span> <span class="ruby-ivar">@masterPath</span>
-210:         <span class="ruby-keyword kw">else</span>
-211:           <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>
-212:           <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>
-213:           <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>[<span class="ruby-value">1</span>, <span class="ruby-value">2</span>] = [ <span class="ruby-ivar">@tokenBuffer</span>, <span class="ruby-ivar">@pos</span> ]
-214:         <span class="ruby-keyword kw">end</span>
-215:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
-216:         <span class="ruby-comment cmt"># name relative to the including file.</span>
-217:         <span class="ruby-identifier">fileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">fileName</span>
-218:       <span class="ruby-keyword kw">end</span>
-219: 
-220:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-221: 
-222:       <span class="ruby-comment cmt"># Check the current file stack to find recusions.</span>
-223:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@pos</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">fileName</span>
-224:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} detected&quot;</span>)
-225:       <span class="ruby-keyword kw">else</span>
-226:         <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>
-227:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileName</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">entry</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">fileName</span>
-228:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>, <span class="ruby-node">&quot;Recursive inclusion of #{fileName} &quot;</span> <span class="ruby-operator">+</span>
-229:                   <span class="ruby-value str">&quot;detected&quot;</span>)
-230:           <span class="ruby-keyword kw">end</span>
-231:         <span class="ruby-keyword kw">end</span>
-232:       <span class="ruby-keyword kw">end</span>
-233:       <span class="ruby-keyword kw">begin</span>
-234:         <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">fileName</span>)), <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span> ]
-235:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-236:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_include'</span>, <span class="ruby-node">&quot;Cannot open include file #{fileName}&quot;</span>)
-237:       <span class="ruby-keyword kw">end</span>
-238:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 280</span>
+280:     <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>)
+281:       <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>
+282:         <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>
+283:         <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>
+284:         <span class="ruby-comment cmt"># If the included file is not an absolute name, we interpret the file</span>
+285:         <span class="ruby-comment cmt"># name relative to the including file.</span>
+286:         <span class="ruby-identifier">includeFileName</span> = <span class="ruby-identifier">path</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">includeFileName</span>
+287:       <span class="ruby-keyword kw">end</span>
+288: 
+289:       <span class="ruby-comment cmt"># Try to dectect recursive inclusions. This will not work if files are</span>
+290:       <span class="ruby-comment cmt"># accessed via filesystem links.</span>
+291:       <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>
+292:         <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>
+293:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'include_recursion'</span>,
+294:                 <span class="ruby-node">&quot;Recursive inclusion of #{includeFileName} detected&quot;</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sfi</span>)
+295:         <span class="ruby-keyword kw">end</span>
+296:       <span class="ruby-keyword kw">end</span>
+297: 
+298:       <span class="ruby-comment cmt"># Save @tokenBuffer in the record of the parent file.</span>
+299:       <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>
+300:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+301:       <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+302: 
+303:       <span class="ruby-comment cmt"># Open the new file and push the handle on the @fileStack.</span>
+304:       <span class="ruby-keyword kw">begin</span>
+305:         <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>, ]
+306:         <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{includeFileName}&quot;</span>
+307:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+308:         <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>,
+309:               <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sfi</span>)
+310:       <span class="ruby-keyword kw">end</span>
+311:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -940,7 +1002,7 @@ where we started with the new file.
 
 		
 			<div id="macro-efined--method" class="method-detail ">
-				<a name="M001140"></a>
+				<a name="method-i-macroDefined%3F"></a>
 
 				<div class="method-heading">
 				
@@ -962,10 +1024,10 @@ added already.
 					<div class="method-source-code"
 						id="macro-efined--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 352</span>
-352:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
-353:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
-354:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 429</span>
+429:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">macroDefined?</span>(<span class="ruby-identifier">name</span>)
+430:       <span class="ruby-ivar">@macroTable</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">name</span>)
+431:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -977,12 +1039,12 @@ added already.
 
 		
 			<div id="message-method" class="method-detail ">
-				<a name="M001144"></a>
+				<a name="method-i-message"></a>
 
 				<div class="method-heading">
 				
 					<span class="method-name">message</span><span
-						class="method-args">(type, id, text, property)</span>
+						class="method-args">(type, id, text, property, sfi)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -996,26 +1058,32 @@ added already.
 					<div class="method-source-code"
 						id="message-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 381</span>
-381:     <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">property</span>)
-382:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
-383:         <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">to_s</span>,
-384:                               <span class="ruby-identifier">property</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sourceFileInfo</span>)
-385:         <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
-386: 
-387:         <span class="ruby-keyword kw">until</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span>
-388:           <span class="ruby-identifier">macro</span>, <span class="ruby-identifier">args</span> = <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
-389:           <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> }
-390:           <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'info'</span>,
-391:                                 <span class="ruby-node">&quot;   #{macro.name} #{args.join(' ')}&quot;</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>,
-392:                                 <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
-393:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
-394:         <span class="ruby-keyword kw">end</span>
-395:       <span class="ruby-keyword kw">end</span>
-396: 
-397:       <span class="ruby-comment cmt"># An empty strings signals an already reported error</span>
-398:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'error'</span>
-399:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 457</span>
+457:     <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">property</span>, <span class="ruby-identifier">sfi</span>)
+458:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">text</span>.<span class="ruby-identifier">empty?</span>
+459:         <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">type</span>, <span class="ruby-identifier">text</span> <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">line</span>.<span class="ruby-identifier">to_s</span>,
+460:                               <span class="ruby-identifier">property</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sfi</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">sourceFileInfo</span>)
+461:         <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
+462: 
+463:         <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>
+464:           <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'info'</span>, <span class="ruby-value str">'Macro call history:'</span>)
+465:           <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
+466: 
+467:           <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>
+468:             <span class="ruby-identifier">macro</span> = <span class="ruby-identifier">entry</span>.<span class="ruby-identifier">macro</span>
+469:             <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>]
+470:             <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> }
+471:             <span class="ruby-identifier">message</span> = <span class="ruby-constant">Message</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'macro_stack'</span>, <span class="ruby-value str">'info'</span>,
+472:                                   <span class="ruby-node">&quot;  ${#{macro.name} #{args.join(' ')}}&quot;</span>,
+473:                                   <span class="ruby-keyword kw">nil</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">macro</span>.<span class="ruby-identifier">sourceFileInfo</span>)
+474:             <span class="ruby-ivar">@messageHandler</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">message</span>)
+475:           <span class="ruby-keyword kw">end</span>
+476:         <span class="ruby-keyword kw">end</span>
+477:       <span class="ruby-keyword kw">end</span>
+478: 
+479:       <span class="ruby-comment cmt"># An empty strings signals an already reported error</span>
+480:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">type</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'error'</span>
+481:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1026,13 +1094,13 @@ added already.
 			</div>
 
 		
-			<div id="next-oken-method" class="method-detail ">
-				<a name="M001137"></a>
+			<div id="mode--method" class="method-detail ">
+				<a name="method-i-mode%3D"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">nextToken</span><span
-						class="method-args">()</span>
+					<span class="method-name">mode=</span><span
+						class="method-args">(newMode)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1040,84 +1108,22 @@ added already.
 				<div class="method-description">
 					
 					<p>
-Scan for the next token in the input stream and return it. The result will
-be an Array of the form [ TokenType, TokenValue ].
+Switch the parser to another mode. The scanner will then only detect with
+pattens of that <em>newMode</em>.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="next-oken-source">
+						id="mode--source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 265</span>
-265:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
-266:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
-267:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-268:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
-269:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-270:         <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@tokenBufferPos</span>
-271:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
-272:       <span class="ruby-keyword kw">end</span>
-273: 
-274:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
-275:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-276:       <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'.'</span>, <span class="ruby-value str">'&lt;END&gt;'</span> ]
-277:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>
-278:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">c</span>
-279:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">' '</span>, <span class="ruby-value str">&quot;\n&quot;</span>, <span class="ruby-value str">&quot;\t&quot;</span>
-280:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">tok</span> = <span class="ruby-identifier">readBlanks</span>(<span class="ruby-identifier">c</span>))
-281:             <span class="ruby-identifier">token</span> = <span class="ruby-identifier">tok</span>
-282:             <span class="ruby-keyword kw">break</span>
-283:           <span class="ruby-keyword kw">end</span>
-284:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-285:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'#'</span>
-286:           <span class="ruby-identifier">skipComment</span>
-287:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-288:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'/'</span>
-289:           <span class="ruby-identifier">skipCPlusPlusComments</span>
-290:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-291:           <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>
-292:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readNumber</span>(<span class="ruby-identifier">c</span>)
-293:           <span class="ruby-keyword kw">break</span>
-294:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;'&quot;</span>
-295:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
-296:           <span class="ruby-keyword kw">break</span>
-297:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&quot;'</span>
-298:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">c</span>)
-299:           <span class="ruby-keyword kw">break</span>
-300:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'-'</span>
-301:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">handleDash</span>
-302:           <span class="ruby-keyword kw">break</span>
-303:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'!'</span>
-304:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
-305:             <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'!='</span> ]
-306:           <span class="ruby-keyword kw">else</span>
-307:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-308:             <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'!'</span> ]
-309:           <span class="ruby-keyword kw">end</span>
-310:           <span class="ruby-keyword kw">break</span>
-311:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>, <span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>, <span class="ruby-value str">'_'</span>
-312:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)
-313:           <span class="ruby-keyword kw">break</span>
-314:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>, <span class="ruby-value str">'&gt;'</span>, <span class="ruby-value str">'='</span>
-315:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readOperator</span>(<span class="ruby-identifier">c</span>)
-316:           <span class="ruby-keyword kw">break</span>
-317:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'['</span>
-318:           <span class="ruby-identifier">token</span> = <span class="ruby-identifier">readMacro</span>
-319:           <span class="ruby-keyword kw">break</span>
-320:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
-321:           <span class="ruby-comment cmt"># We've reached an end of file or buffer</span>
-322:           <span class="ruby-keyword kw">break</span>
-323:         <span class="ruby-keyword kw">else</span>
-324:           <span class="ruby-identifier">str</span> = <span class="ruby-value str">&quot;&quot;</span>
-325:           <span class="ruby-identifier">str</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-326:           <span class="ruby-identifier">token</span> = [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-identifier">str</span> ]
-327:           <span class="ruby-keyword kw">break</span>
-328:         <span class="ruby-keyword kw">end</span>
-329:       <span class="ruby-keyword kw">end</span>
-330:       <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@startOfToken</span>
-331:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">token</span>
-332:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 242</span>
+242:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mode=</span>(<span class="ruby-identifier">newMode</span>)
+243:       <span class="ruby-comment cmt">#puts &quot;**** New mode: #{newMode}&quot;</span>
+244:       <span class="ruby-ivar">@activePatterns</span> = <span class="ruby-ivar">@patternsByMode</span>[<span class="ruby-identifier">newMode</span>]
+245:       <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>
+246:       <span class="ruby-ivar">@scannerMode</span> = <span class="ruby-identifier">newMode</span>
+247:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1128,13 +1134,13 @@ be an Array of the form [ TokenType, TokenValue ].
 			</div>
 
 		
-			<div id="open-method" class="method-detail ">
-				<a name="M001129"></a>
+			<div id="next-oken-method" class="method-detail ">
+				<a name="method-i-nextToken"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">open</span><span
-						class="method-args">(fileNameIsBuffer = false)</span>
+					<span class="method-name">nextToken</span><span
+						class="method-args">()</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1142,30 +1148,89 @@ be an Array of the form [ TokenType, TokenValue ].
 				<div class="method-description">
 					
 					<p>
-Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
-<a href="../String.html">String</a>, else on a File.
+Return the next token from the input stream. The result is an Array with 3
+entries: the token type, the token <a href="../String.html">String</a> and
+the <a href="SourceFileInfo.html">SourceFileInfo</a> where the token
+started.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="open-source">
+						id="next-oken-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 178</span>
-178:     <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>)
-179:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
-180:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
-181:         <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> ] ]
-182:       <span class="ruby-keyword kw">else</span>
-183:         <span class="ruby-keyword kw">begin</span>
-184:           <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> ] ]
-185:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
-186:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>
-187:         <span class="ruby-keyword kw">end</span>
-188:       <span class="ruby-keyword kw">end</span>
-189:       <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>
-190:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span> = <span class="ruby-keyword kw">nil</span>
-191:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 340</span>
+340:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
+341:       <span class="ruby-comment cmt"># If we have a pushed-back token, return that first.</span>
+342:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+343:         <span class="ruby-identifier">res</span> = <span class="ruby-ivar">@tokenBuffer</span>
+344:         <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+345:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
+346:       <span class="ruby-keyword kw">end</span>
+347: 
+348:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@finishLastFile</span>
+349:         <span class="ruby-comment cmt"># The previously processed file has now really been processed to</span>
+350:         <span class="ruby-comment cmt"># completion. Close it and remove the corresponding entry from the</span>
+351:         <span class="ruby-comment cmt"># @fileStack.</span>
+352:         <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">false</span>
+353:         <span class="ruby-comment cmt">#Log &lt;&lt; &quot;Completed file #{@cf.fileName}&quot;</span>
+354:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">close</span>
+355:         <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">pop</span>
+356: 
+357:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
+358:           <span class="ruby-comment cmt"># We are done with the top-level file now.</span>
+359:           <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+360:           <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
+361:           <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> ]
+362:         <span class="ruby-keyword kw">else</span>
+363:           <span class="ruby-comment cmt"># Continue parsing the file that included the current file.</span>
+364:           <span class="ruby-ivar">@cf</span>, <span class="ruby-identifier">tokenBuffer</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>
+365:           <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@cf.fileName} ...&quot;</span>
+366:           <span class="ruby-comment cmt"># If we have a left over token from previously processing this file,</span>
+367:           <span class="ruby-comment cmt"># return it now.</span>
+368:           <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>
+369:         <span class="ruby-keyword kw">end</span>
+370:       <span class="ruby-keyword kw">end</span>
+371: 
+372:       <span class="ruby-comment cmt"># Start processing characters from the input.</span>
+373:       <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-identifier">sourceFileInfo</span>
+374:       <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
+375:         <span class="ruby-identifier">match</span> = <span class="ruby-keyword kw">nil</span>
+376:         <span class="ruby-keyword kw">begin</span>
+377:           <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>
+378:             <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>))
+379:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span> <span class="ruby-operator">==</span> <span class="ruby-value">:scannerEOF</span>
+380:                 <span class="ruby-comment cmt"># We've found the end of an input file. Return a special token</span>
+381:                 <span class="ruby-comment cmt"># that describes the end of a file.</span>
+382:                 <span class="ruby-ivar">@finishLastFile</span> = <span class="ruby-keyword kw">true</span>
+383:                 <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> ]
+384:               <span class="ruby-keyword kw">end</span>
+385: 
+386:               <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>
+387:               <span class="ruby-comment cmt"># If we have a post processing method, call it now. It may modify</span>
+388:               <span class="ruby-comment cmt"># the type or the found token String.</span>
+389:               <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>
+390: 
+391:               <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>
+392: 
+393:               <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> ]
+394:             <span class="ruby-keyword kw">end</span>
+395:           <span class="ruby-keyword kw">end</span>
+396:         <span class="ruby-keyword kw">rescue</span>
+397:           <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>)
+398:         <span class="ruby-keyword kw">end</span>
+399: 
+400:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">match</span>.<span class="ruby-identifier">nil?</span>
+401:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">eof?</span>
+402:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unexpected_eof'</span>,
+403:                   <span class="ruby-value str">&quot;Unexpected end of file found&quot;</span>)
+404:           <span class="ruby-keyword kw">else</span>
+405:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'no_token_match'</span>,
+406:                   <span class="ruby-node">&quot;Unexpected characters found: '#{@cf.peek(10)}...'&quot;</span>)
+407:           <span class="ruby-keyword kw">end</span>
+408:         <span class="ruby-keyword kw">end</span>
+409:       <span class="ruby-keyword kw">end</span>
+410:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1176,13 +1241,13 @@ Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
 			</div>
 
 		
-			<div id="return-oken-method" class="method-detail ">
-				<a name="M001138"></a>
+			<div id="open-method" class="method-detail ">
+				<a name="method-i-open"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">returnToken</span><span
-						class="method-args">(token)</span>
+					<span class="method-name">open</span><span
+						class="method-args">(fileNameIsBuffer = false)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1190,25 +1255,30 @@ Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
 				<div class="method-description">
 					
 					<p>
-Return a token to retrieve it with the next nextToken() call again. Only 1
-token can be returned before the next nextToken() call.
+Start the processing. if <em>fileNameIsBuffer</em> is true, we operate on a
+<a href="../String.html">String</a>, else on a File.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="return-oken-source">
+						id="open-source">
 <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">returnToken</span>(<span class="ruby-identifier">token</span>)
-337:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
-338:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
-339:         <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>
-340:       <span class="ruby-keyword kw">end</span>
-341:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
-342:       <span class="ruby-ivar">@tokenBufferPos</span> = <span class="ruby-ivar">@pos</span>
-343:       <span class="ruby-ivar">@pos</span> = <span class="ruby-ivar">@lastPos</span>
-344:     <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">open</span>(<span class="ruby-identifier">fileNameIsBuffer</span> = <span class="ruby-keyword kw">false</span>)
+253:       <span class="ruby-ivar">@fileNameIsBuffer</span> = <span class="ruby-identifier">fileNameIsBuffer</span>
+254:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fileNameIsBuffer</span>
+255:         <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> ] ]
+256:       <span class="ruby-keyword kw">else</span>
+257:         <span class="ruby-keyword kw">begin</span>
+258:           <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> ] ]
+259:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">StandardError</span>
+260:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-node">&quot;Cannot open file #{@masterFile}&quot;</span>
+261:         <span class="ruby-keyword kw">end</span>
+262:       <span class="ruby-keyword kw">end</span>
+263:       <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>
+264:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
+265:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1219,13 +1289,13 @@ token can be returned before the next nextToken() call.
 			</div>
 
 		
-			<div id="source-ile-nfo-method" class="method-detail ">
-				<a name="M001132"></a>
+			<div id="return-oken-method" class="method-detail ">
+				<a name="method-i-returnToken"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">sourceFileInfo</span><span
-						class="method-args">()</span>
+					<span class="method-name">returnToken</span><span
+						class="method-args">(token)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1233,145 +1303,24 @@ token can be returned before the next nextToken() call.
 				<div class="method-description">
 					
 					<p>
-Return <a href="SourceFileInfo.html">SourceFileInfo</a> for the current
-processing prosition.
+Return a token to retrieve it with the next nextToken() call again. Only 1
+token can be returned before the next nextToken() call.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="source-ile-nfo-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 241</span>
-241:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
-242:       <span class="ruby-ivar">@pos</span> <span class="ruby-operator">?</span> <span class="ruby-ivar">@pos</span>.<span class="ruby-identifier">dup</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-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-243:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="warning-method" class="method-detail ">
-				<a name="M001143"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">warning</span><span
-						class="method-args">(id, text, property = nil)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="warning-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 377</span>
-377:     <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">property</span> = <span class="ruby-keyword kw">nil</span>)
-378:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'warning'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>)
-379:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-		</div>
-	
-		<div id="private-instance-method-details" class="method-section section">
-			<h3 class="section-header">Private Instance Methods</h3>
-
-		
-			<div id="error--method" class="method-detail ">
-				<a name="M001161"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">errorEOF</span><span
-						class="method-args">(no, token)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="error--source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 894</span>
-894:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">errorEOF</span>(<span class="ruby-identifier">no</span>, <span class="ruby-identifier">token</span>)
-895:       <span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;eof_in_istring#{no}&quot;</span>,
-896:             <span class="ruby-node">&quot;Unexpected end of file in string '#{token[0,20]}...'&quot;</span> <span class="ruby-operator">+</span>
-897:             <span class="ruby-node">&quot;starting in line #{@startOfToken.lineNo}.&quot;</span>)
-898:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="handle-ash-method" class="method-detail ">
-				<a name="M001150"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">handleDash</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="handle-ash-source">
+						id="return-oken-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 524</span>
-524:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">handleDash</span>
-525:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c1</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'8'</span>
-526:         <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c2</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'&lt;'</span>
-527:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c3</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-528:             <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">readIndentedString</span>
-529:           <span class="ruby-keyword kw">else</span>
-530:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c3</span>)
-531:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c2</span>)
-532:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c1</span>)
-533:           <span class="ruby-keyword kw">end</span>
-534:         <span class="ruby-keyword kw">else</span>
-535:           <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c2</span>)
-536:           <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c1</span>)
-537:         <span class="ruby-keyword kw">end</span>
-538:       <span class="ruby-keyword kw">else</span>
-539:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c1</span>)
-540:       <span class="ruby-keyword kw">end</span>
-541:       <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">' - '</span>]
-542:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 414</span>
+414:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
+415:       <span class="ruby-comment cmt">#Log &lt;&lt; &quot;-&gt; Returning Token: [#{token[0]}][#{token[1]}]&quot;</span>
+416:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@tokenBuffer</span>.<span class="ruby-identifier">nil?</span>
+417:         <span class="ruby-identifier">$stderr</span>.<span class="ruby-identifier">puts</span> <span class="ruby-ivar">@tokenBuffer</span>
+418:         <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>
+419:       <span class="ruby-keyword kw">end</span>
+420:       <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-identifier">token</span>
+421:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1382,12 +1331,12 @@ processing prosition.
 			</div>
 
 		
-			<div id="next-har-method" class="method-detail ">
-				<a name="M001145"></a>
+			<div id="source-ile-nfo-method" class="method-detail ">
+				<a name="method-i-sourceFileInfo"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">nextChar</span><span
+					<span class="method-name">sourceFileInfo</span><span
 						class="method-args">()</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
@@ -1396,180 +1345,20 @@ processing prosition.
 				<div class="method-description">
 					
 					<p>
-This function is called by the scanner to get the next character. It
-features a FIFO buffer that can hold any amount of returned characters.
-When it has reached the end of the master file it returns nil.
+Return <a href="SourceFileInfo.html">SourceFileInfo</a> for the current
+processing prosition.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="next-har-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 406</span>
-406:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextChar</span>
-407:       <span class="ruby-comment cmt"># We've started to find the next token. @pos no longer marks the</span>
-408:       <span class="ruby-comment cmt"># position of the current token. Since we also store the EOF position in</span>
-409:       <span class="ruby-comment cmt"># @pos, don't reset it if we have processed all files completely.</span>
-410:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@pos</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@cf</span>
-411:         <span class="ruby-ivar">@lastPos</span> = <span class="ruby-ivar">@pos</span>
-412:         <span class="ruby-ivar">@pos</span> = <span class="ruby-keyword kw">nil</span>
-413:       <span class="ruby-keyword kw">end</span>
-414: 
-415:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextCharI</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'$'</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@ignoreMacros</span>
-416:         <span class="ruby-comment cmt"># Double $ are reduced to a single $.</span>
-417:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">c</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextCharI</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'$'</span>
-418: 
-419:         <span class="ruby-comment cmt"># Macros start with $( or ${. All other $. are ignored.</span>
-420:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">'('</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">'{'</span>
-421:            <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-422:            <span class="ruby-keyword kw">return</span> <span class="ruby-value str">'$'</span>
-423:         <span class="ruby-keyword kw">end</span>
-424: 
-425:         <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">true</span>
-426:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-427:         <span class="ruby-identifier">macroParser</span> = <span class="ruby-constant">MacroParser</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>, <span class="ruby-ivar">@messageHandler</span>)
-428:         <span class="ruby-keyword kw">begin</span>
-429:           <span class="ruby-identifier">macroParser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-value str">'macroCall'</span>)
-430:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">TjException</span>
-431:         <span class="ruby-keyword kw">end</span>
-432:         <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
-433:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">nextCharI</span>
-434:       <span class="ruby-keyword kw">else</span>
-435:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">c</span>
-436:       <span class="ruby-keyword kw">end</span>
-437:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="next-har--method" class="method-detail ">
-				<a name="M001146"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">nextCharI</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="next-har--source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 439</span>
-439:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextCharI</span>
-440:       <span class="ruby-comment cmt"># This can only happen when a previous call already returned nil.</span>
-441:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">nil?</span>
-442: 
-443:       <span class="ruby-identifier">c</span> = <span class="ruby-keyword kw">nil</span>
-444:       <span class="ruby-comment cmt"># If there are characters in the return buffer process them first.</span>
-445:       <span class="ruby-comment cmt"># Otherwise get next character from input stream.</span>
-446:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>.<span class="ruby-identifier">empty?</span>
-447:         <span class="ruby-identifier">c</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>.<span class="ruby-identifier">pop</span>
-448:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">lineNo</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span>
-449:         <span class="ruby-keyword kw">while</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
-450:           <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>.<span class="ruby-identifier">pop</span>
-451:           <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">pop</span>
-452:         <span class="ruby-keyword kw">end</span>
-453:       <span class="ruby-keyword kw">else</span>
-454:         <span class="ruby-comment cmt"># If EOF has been reached, try the parent file until even the master</span>
-455:         <span class="ruby-comment cmt"># file has been processed completely.</span>
-456:         <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">getc</span>).<span class="ruby-identifier">nil?</span>
-457:           <span class="ruby-comment cmt"># Safe current position so an EOF related error can be properly</span>
-458:           <span class="ruby-comment cmt"># reported.</span>
-459:           <span class="ruby-ivar">@pos</span> = <span class="ruby-identifier">sourceFileInfo</span>
-460: 
-461:           <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">close</span>
-462:           <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">pop</span>
-463:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">empty?</span>
-464:             <span class="ruby-comment cmt"># We are done with the top-level file now.</span>
-465:             <span class="ruby-ivar">@cf</span> = <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-466:           <span class="ruby-keyword kw">else</span>
-467:             <span class="ruby-ivar">@cf</span>, <span class="ruby-ivar">@tokenBuffer</span>, <span class="ruby-ivar">@lastPos</span> = <span class="ruby-ivar">@fileStack</span>.<span class="ruby-identifier">last</span>
-468:             <span class="ruby-constant">Log</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;Parsing file #{@cf.fileName} ...&quot;</span>
-469:             <span class="ruby-comment cmt"># We have been called by nextToken() already, so we can't just</span>
-470:             <span class="ruby-comment cmt"># restore @tokenBuffer and be done. We need to feed the token text</span>
-471:             <span class="ruby-comment cmt"># back into the charBuffer and return the first character.</span>
-472:             <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@tokenBuffer</span>
-473:               <span class="ruby-ivar">@tokenBuffer</span>[<span class="ruby-value">1</span>].<span class="ruby-identifier">reverse</span>.<span class="ruby-identifier">each_utf8_char</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">ch</span><span class="ruby-operator">|</span>
-474:                 <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span>.<span class="ruby-identifier">push</span>(<span class="ruby-identifier">ch</span>)
-475:               <span class="ruby-keyword kw">end</span>
-476:               <span class="ruby-ivar">@tokenBuffer</span> = <span class="ruby-keyword kw">nil</span>
-477:             <span class="ruby-keyword kw">end</span>
-478:           <span class="ruby-keyword kw">end</span>
-479:           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-480:         <span class="ruby-keyword kw">end</span>
-481:       <span class="ruby-keyword kw">end</span>
-482:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-483:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">lineNo</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\n&quot;</span>
-484:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> = <span class="ruby-value str">&quot;&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span>[<span class="ruby-value">1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">\n\</span>
-485:         <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-486:       <span class="ruby-keyword kw">end</span>
-487:       <span class="ruby-identifier">c</span>
-488:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-lanks-method" class="method-detail ">
-				<a name="M001151"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readBlanks</span><span
-						class="method-args">(c)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-lanks-source">
+						id="source-ile-nfo-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 544</span>
-544:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readBlanks</span>(<span class="ruby-identifier">c</span>)
-545:       <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-546:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">' '</span>
-547:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c2</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-548:             <span class="ruby-comment cmt"># Special case for the dash between period dates. It must be</span>
-549:             <span class="ruby-comment cmt"># surrounded by blanks.</span>
-550:             <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c3</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">' '</span>
-551:               <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">' - '</span>]
-552:             <span class="ruby-keyword kw">end</span>
-553:             <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c3</span>)
-554:           <span class="ruby-keyword kw">end</span>
-555:           <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c2</span>)
-556:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\t&quot;</span>
-557:           <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-558:           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-559:         <span class="ruby-keyword kw">end</span>
-560:         <span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>
-561:       <span class="ruby-keyword kw">end</span>
-562:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 314</span>
+314:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sourceFileInfo</span>
+315:       <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>
+316:             <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>)
+317:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -1580,13 +1369,13 @@ When it has reached the end of the master file it returns nil.
 			</div>
 
 		
-			<div id="read-ate-method" class="method-detail ">
-				<a name="M001153"></a>
+			<div id="warning-method" class="method-detail ">
+				<a name="method-i-warning"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">readDate</span><span
-						class="method-args">(token)</span>
+					<span class="method-name">warning</span><span
+						class="method-args">(id, text, property = nil, sfi = nil)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -1598,805 +1387,12 @@ When it has reached the end of the master file it returns nil.
 
 					
 					<div class="method-source-code"
-						id="read-ate-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 598</span>
-598:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readDate</span>(<span class="ruby-identifier">token</span>)
-599:       <span class="ruby-identifier">year</span> = <span class="ruby-identifier">token</span>.<span class="ruby-identifier">to_i</span>
-600:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">year</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">1970</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">year</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">2030</span>
-601:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Year must be between 1970 and 2030&quot;</span>
-602:       <span class="ruby-keyword kw">end</span>
-603: 
-604:       <span class="ruby-identifier">month</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-605:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">month</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">1</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">month</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">12</span>
-606:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Month must be between 1 and 12&quot;</span>
-607:       <span class="ruby-keyword kw">end</span>
-608:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">nextChar</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">'-'</span>
-609:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Corrupted date&quot;</span>
-610:       <span class="ruby-keyword kw">end</span>
-611: 
-612:       <span class="ruby-identifier">day</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-613:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">day</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">1</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">day</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">31</span>
-614:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Day must be between 1 and 31&quot;</span>
-615:       <span class="ruby-keyword kw">end</span>
-616: 
-617:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">'-'</span>
-618:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-619:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'DATE'</span>, <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">local</span>(<span class="ruby-identifier">year</span>, <span class="ruby-identifier">month</span>, <span class="ruby-identifier">day</span>) ]
-620:       <span class="ruby-keyword kw">end</span>
-621: 
-622:       <span class="ruby-identifier">hour</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-623:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">hour</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">hour</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">23</span>
-624:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Hour must be between 0 and 23&quot;</span>
-625:       <span class="ruby-keyword kw">end</span>
-626: 
-627:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">nextChar</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">':'</span>
-628:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Corrupted time. ':' expected.&quot;</span>
-629:       <span class="ruby-keyword kw">end</span>
-630: 
-631:       <span class="ruby-identifier">minutes</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-632:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">minutes</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">minutes</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">59</span>
-633:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Minutes must be between 0 and 59&quot;</span>
-634:       <span class="ruby-keyword kw">end</span>
-635: 
-636:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">':'</span>
-637:         <span class="ruby-identifier">seconds</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-638:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">seconds</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">seconds</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">59</span>
-639:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Seconds must be between 0 and 59&quot;</span>
-640:         <span class="ruby-keyword kw">end</span>
-641:       <span class="ruby-keyword kw">else</span>
-642:         <span class="ruby-identifier">seconds</span> = <span class="ruby-value">0</span>
-643:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-644:       <span class="ruby-keyword kw">end</span>
-645: 
-646:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">'-'</span>
-647:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-648:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'DATE'</span>, <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">local</span>(<span class="ruby-identifier">year</span>, <span class="ruby-identifier">month</span>, <span class="ruby-identifier">day</span>, <span class="ruby-identifier">hour</span>, <span class="ruby-identifier">minutes</span>, <span class="ruby-identifier">seconds</span>) ]
-649:       <span class="ruby-keyword kw">end</span>
-650: 
-651:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-652:         <span class="ruby-identifier">delta</span> = <span class="ruby-value">1</span>
-653:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'+'</span>
-654:         <span class="ruby-identifier">delta</span> = <span class="ruby-value">1</span>
-655:       <span class="ruby-keyword kw">else</span>
-656:         <span class="ruby-comment cmt"># An actual time zone name</span>
-657:         <span class="ruby-identifier">tz</span> = <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)[<span class="ruby-value">1</span>]
-658:         <span class="ruby-identifier">oldTz</span> = <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TZ'</span>]
-659:         <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TZ'</span>] = <span class="ruby-identifier">tz</span>
-660:         <span class="ruby-identifier">timeVal</span> = <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">local</span>(<span class="ruby-identifier">year</span>, <span class="ruby-identifier">month</span>, <span class="ruby-identifier">day</span>, <span class="ruby-identifier">hour</span>, <span class="ruby-identifier">minutes</span>, <span class="ruby-identifier">seconds</span>)
-661:         <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TZ'</span>] = <span class="ruby-identifier">oldTz</span>
-662:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">timeVal</span>.<span class="ruby-identifier">to_a</span>[<span class="ruby-value">9</span>] <span class="ruby-operator">!=</span> <span class="ruby-identifier">tz</span>
-663:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-node">&quot;Unknown time zone #{tz}&quot;</span>
-664:         <span class="ruby-keyword kw">end</span>
-665:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'DATE'</span>, <span class="ruby-identifier">timeVal</span> ]
-666:       <span class="ruby-keyword kw">end</span>
-667: 
-668:       <span class="ruby-identifier">utcDiff</span> = <span class="ruby-identifier">readDigits</span>
-669:       <span class="ruby-identifier">utcHour</span> = <span class="ruby-identifier">utcDiff</span>[<span class="ruby-value">0</span>, <span class="ruby-value">2</span>].<span class="ruby-identifier">to_i</span>
-670:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">utcHour</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">utcHour</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">23</span>
-671:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Hour must be between 0 and 23&quot;</span>
-672:       <span class="ruby-keyword kw">end</span>
-673:       <span class="ruby-identifier">utcMin</span> = <span class="ruby-identifier">utcDiff</span>[<span class="ruby-value">2</span>, <span class="ruby-value">2</span>].<span class="ruby-identifier">to_i</span>
-674:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">utcMin</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">utcMin</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">59</span>
-675:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Minutes must be between 0 and 59&quot;</span>
-676:       <span class="ruby-keyword kw">end</span>
-677: 
-678:       [ <span class="ruby-value str">'DATE'</span>, <span class="ruby-constant">TjTime</span>.<span class="ruby-identifier">gm</span>(<span class="ruby-identifier">year</span>, <span class="ruby-identifier">month</span>, <span class="ruby-identifier">day</span>, <span class="ruby-identifier">hour</span>, <span class="ruby-identifier">minutes</span>, <span class="ruby-identifier">seconds</span>) <span class="ruby-operator">+</span>
-679:                 <span class="ruby-identifier">delta</span> * ((<span class="ruby-identifier">utcHour</span> * <span class="ruby-value">3600</span>) <span class="ruby-operator">+</span> <span class="ruby-identifier">utcMin</span> * <span class="ruby-value">60</span>) ]
-680:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-igits-method" class="method-detail ">
-				<a name="M001159"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readDigits</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					<p>
-Read only decimal digits and return the result als Fixnum.
-</p>
-					
-
-					
-					<div class="method-source-code"
-						id="read-igits-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 865</span>
-865:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readDigits</span>
-866:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-867:       <span class="ruby-keyword kw">while</span> (<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>) <span class="ruby-operator">===</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>)
-868:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-869:       <span class="ruby-keyword kw">end</span>
-870:       <span class="ruby-comment cmt"># Make sure that we have read at least one digit.</span>
-871:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">token</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;&quot;</span>
-872:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Digit (0 - 9) expected&quot;</span>
-873:       <span class="ruby-keyword kw">end</span>
-874:       <span class="ruby-comment cmt"># Push back the non-digit that terminated the digits.</span>
-875:       <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-876:       <span class="ruby-identifier">token</span>
-877:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-d-method" class="method-detail ">
-				<a name="M001156"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readId</span><span
-						class="method-args">(c)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-d-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 801</span>
-801:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)
-802:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-803:       <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-804:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span>
-805:             ((<span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>)  <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span>
-806:              <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'_'</span>)
-807:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-808:       <span class="ruby-keyword kw">end</span>
-809:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">':'</span>
-810:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ID_WITH_COLON'</span>, <span class="ruby-identifier">token</span> ]
-811:       <span class="ruby-keyword kw">elsif</span>  <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
-812:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-813:         <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-814:           <span class="ruby-identifier">token</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">readIdentifier</span>
-815:           <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">'.'</span>
-816:           <span class="ruby-identifier">token</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">'.'</span>
-817:         <span class="ruby-keyword kw">end</span>
-818:         <span class="ruby-identifier">returnChar</span> <span class="ruby-identifier">c</span>
-819: 
-820:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ABSOLUTE_ID'</span>, <span class="ruby-identifier">token</span> ]
-821:       <span class="ruby-keyword kw">else</span>
-822:         <span class="ruby-identifier">returnChar</span> <span class="ruby-identifier">c</span>
-823:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ID'</span>, <span class="ruby-identifier">token</span> ]
-824:       <span class="ruby-keyword kw">end</span>
-825:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-dentifier-method" class="method-detail ">
-				<a name="M001160"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readIdentifier</span><span
-						class="method-args">(noDigit = true)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-dentifier-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 879</span>
-879:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readIdentifier</span>(<span class="ruby-identifier">noDigit</span> = <span class="ruby-keyword kw">true</span>)
-880:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-881:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span>
-882:             ((<span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span>
-883:              (<span class="ruby-operator">!</span><span class="ruby-identifier">noDigit</span> <span class="ruby-operator">&amp;&amp;</span> ((<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>)  <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span>)) <span class="ruby-operator">||</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'_'</span>)
-884:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-885:         <span class="ruby-identifier">noDigit</span> = <span class="ruby-keyword kw">false</span>
-886:       <span class="ruby-keyword kw">end</span>
-887:       <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-888:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">token</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;&quot;</span>
-889:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Identifier expected&quot;</span>
-890:       <span class="ruby-keyword kw">end</span>
-891:       <span class="ruby-identifier">token</span>
-892:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-ndented-tring-method" class="method-detail ">
-				<a name="M001155"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readIndentedString</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-ndented-tring-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 698</span>
-698:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readIndentedString</span>
-699:       <span class="ruby-identifier">state</span> = <span class="ruby-value">0</span>
-700:       <span class="ruby-identifier">indent</span> = <span class="ruby-value str">''</span>
-701:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">''</span>
-702:       <span class="ruby-keyword kw">while</span> <span class="ruby-keyword kw">true</span>
-703:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">state</span>
-704:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">0</span> <span class="ruby-comment cmt"># Determining indent</span>
-705:           <span class="ruby-comment cmt"># Skip trailing spaces and tabs.</span>
-706:           <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">' '</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\t&quot;</span> <span class="ruby-keyword kw">do</span>
-707:             <span class="ruby-comment cmt"># empty on purpose</span>
-708:           <span class="ruby-keyword kw">end</span>
-709:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\n&quot;</span>
-710:             <span class="ruby-identifier">error</span>(<span class="ruby-value str">'junk_after_cut'</span>,
-711:                   <span class="ruby-value str">'The cut mark -8&lt;- must be immediately followed by a '</span> <span class="ruby-operator">+</span>
-712:                   <span class="ruby-value str">'line break.'</span>)
-713:           <span class="ruby-keyword kw">end</span>
-714:           <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">' '</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\t&quot;</span>
-715:             <span class="ruby-identifier">indent</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-716:           <span class="ruby-keyword kw">end</span>
-717:           <span class="ruby-ivar">@startOfToken</span> = <span class="ruby-constant">SourceFileInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">fileName</span>, <span class="ruby-identifier">lineNo</span>, <span class="ruby-identifier">columnNo</span>)
-718:           <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-719:           <span class="ruby-identifier">state</span> = <span class="ruby-value">1</span>
-720:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">1</span> <span class="ruby-comment cmt"># reading '-' or first content line character</span>
-721:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-722:             <span class="ruby-identifier">state</span> = <span class="ruby-value">3</span>
-723:           <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-724:             <span class="ruby-identifier">errorEOF</span>(<span class="ruby-value">1</span>, <span class="ruby-identifier">token</span>)
-725:           <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\n&quot;</span>
-726:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-727:             <span class="ruby-identifier">state</span> = <span class="ruby-value">6</span>
-728:           <span class="ruby-keyword kw">else</span>
-729:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-730:             <span class="ruby-identifier">state</span> = <span class="ruby-value">2</span>
-731:           <span class="ruby-keyword kw">end</span>
-732:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">2</span> <span class="ruby-comment cmt"># reading content line</span>
-733:           <span class="ruby-comment cmt"># The '-&gt;8-' is only valid if no other content preceded it on this</span>
-734:           <span class="ruby-comment cmt"># line.</span>
-735:           <span class="ruby-identifier">onlyBlanks</span> = <span class="ruby-keyword kw">true</span>
-736:           <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">onlyBlanks</span>)
-737:             <span class="ruby-identifier">onlyBlanks</span> = <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">' '</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\t&quot;</span>
-738:             <span class="ruby-identifier">errorEOF</span>(<span class="ruby-value">2</span>, <span class="ruby-identifier">token</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-739:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-740:           <span class="ruby-keyword kw">end</span>
-741:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-742:             <span class="ruby-comment cmt"># we may have found the start of '-&gt;8-'</span>
-743:             <span class="ruby-identifier">state</span> = <span class="ruby-value">3</span>
-744:           <span class="ruby-keyword kw">else</span>
-745:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-746:             <span class="ruby-identifier">state</span> = <span class="ruby-value">6</span>
-747:           <span class="ruby-keyword kw">end</span>
-748:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">3</span> <span class="ruby-comment cmt"># reading '&gt;' of '-&gt;8-'</span>
-749:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'&gt;'</span>
-750:             <span class="ruby-identifier">state</span> = <span class="ruby-value">4</span>
-751:           <span class="ruby-keyword kw">else</span>
-752:             <span class="ruby-identifier">errorEOF</span>(<span class="ruby-value">3</span>, <span class="ruby-identifier">token</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-753:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'-'</span>
-754:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-755:             <span class="ruby-identifier">state</span> = <span class="ruby-value">2</span>
-756:           <span class="ruby-keyword kw">end</span>
-757:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">4</span> <span class="ruby-comment cmt"># reading '8' of '-&gt;8-'</span>
-758:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'8'</span>
-759:             <span class="ruby-identifier">state</span> = <span class="ruby-value">5</span>
-760:           <span class="ruby-keyword kw">else</span>
-761:             <span class="ruby-identifier">errorEOF</span>(<span class="ruby-value">4</span>, <span class="ruby-identifier">token</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-762:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-763:             <span class="ruby-identifier">state</span> = <span class="ruby-value">2</span>
-764:           <span class="ruby-keyword kw">end</span>
-765:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">5</span> <span class="ruby-comment cmt"># reading '-' of '-&gt;8-'</span>
-766:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-767:             <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'STRING'</span>, <span class="ruby-identifier">token</span> ]
-768:           <span class="ruby-keyword kw">else</span>
-769:             <span class="ruby-identifier">errorEOF</span>(<span class="ruby-value">5</span>, <span class="ruby-identifier">token</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">nil?</span>
-770:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-771:             <span class="ruby-identifier">state</span> = <span class="ruby-value">2</span>
-772:           <span class="ruby-keyword kw">end</span>
-773:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">6</span> <span class="ruby-comment cmt"># reading indentation</span>
-774:           <span class="ruby-identifier">state</span> = <span class="ruby-value">1</span>
-775:           <span class="ruby-identifier">indent</span>.<span class="ruby-identifier">each_utf8_char</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">ci</span><span class="ruby-operator">|</span>
-776:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">ci</span> <span class="ruby-operator">!=</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>)
-777:               <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-778:                 <span class="ruby-identifier">state</span> = <span class="ruby-value">3</span>
-779:                 <span class="ruby-keyword kw">break</span>
-780:               <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\n&quot;</span>
-781:                 <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-782:                 <span class="ruby-keyword kw">break</span>
-783:               <span class="ruby-keyword kw">else</span>
-784:                 <span class="ruby-identifier">warning</span>(<span class="ruby-value str">'bad_indent'</span>,
-785:                         <span class="ruby-value str">&quot;Not all lines of string have same indentation. &quot;</span> <span class="ruby-operator">+</span>
-786:                         <span class="ruby-value str">&quot;The first line of the string determines the &quot;</span> <span class="ruby-operator">+</span>
-787:                         <span class="ruby-value str">&quot;indentation for all subsequent lines of the same &quot;</span> <span class="ruby-operator">+</span>
-788:                         <span class="ruby-value str">&quot;string.&quot;</span>)
-789:                 <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-790:                 <span class="ruby-identifier">state</span> = <span class="ruby-value">2</span>
-791:                 <span class="ruby-keyword kw">break</span>
-792:               <span class="ruby-keyword kw">end</span>
-793:             <span class="ruby-keyword kw">end</span>
-794:           <span class="ruby-keyword kw">end</span>
-795:         <span class="ruby-keyword kw">else</span>
-796:           <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;State machine error&quot;</span>
-797:         <span class="ruby-keyword kw">end</span>
-798:       <span class="ruby-keyword kw">end</span>
-799:     <span class="ruby-keyword kw">end</span>
-800: 
-801:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readId</span>(<span class="ruby-identifier">c</span>)
-802:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-803:       <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-804:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span>
-805:             ((<span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>)  <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span>
-806:              <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'_'</span>)
-807:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-808:       <span class="ruby-keyword kw">end</span>
-809:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">':'</span>
-810:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ID_WITH_COLON'</span>, <span class="ruby-identifier">token</span> ]
-811:       <span class="ruby-keyword kw">elsif</span>  <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
-812:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-813:         <span class="ruby-identifier">loop</span> <span class="ruby-keyword kw">do</span>
-814:           <span class="ruby-identifier">token</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">readIdentifier</span>
-815:           <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">'.'</span>
-816:           <span class="ruby-identifier">token</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">'.'</span>
-817:         <span class="ruby-keyword kw">end</span>
-818:         <span class="ruby-identifier">returnChar</span> <span class="ruby-identifier">c</span>
-819: 
-820:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ABSOLUTE_ID'</span>, <span class="ruby-identifier">token</span> ]
-821:       <span class="ruby-keyword kw">else</span>
-822:         <span class="ruby-identifier">returnChar</span> <span class="ruby-identifier">c</span>
-823:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'ID'</span>, <span class="ruby-identifier">token</span> ]
-824:       <span class="ruby-keyword kw">end</span>
-825:     <span class="ruby-keyword kw">end</span>
-826: 
-827:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readMacro</span>
-828:       <span class="ruby-comment cmt"># We can deal with ']' inside of the macro as long as each ']' is</span>
-829:       <span class="ruby-comment cmt"># preceeded by a corresponding '['.</span>
-830:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">''</span>
-831:       <span class="ruby-identifier">bracketLevel</span> = <span class="ruby-value">1</span>
-832:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-833:         <span class="ruby-keyword kw">case</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextCharI</span>)
-834:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
-835:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unterminated_macro'</span>, <span class="ruby-node">&quot;Unterminated macro #{token}&quot;</span>)
-836:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'['</span>
-837:           <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
-838:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">']'</span>
-839:           <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>
-840:         <span class="ruby-keyword kw">end</span>
-841:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
-842:       <span class="ruby-keyword kw">end</span>
-843:       <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'MACRO'</span>, <span class="ruby-identifier">token</span> ]
-844:     <span class="ruby-keyword kw">end</span>
-845: 
-846:     <span class="ruby-comment cmt"># Read operators of logical expressions.</span>
-847:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readOperator</span>(<span class="ruby-identifier">c</span>)
-848:       <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">c</span>
-849:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'='</span>
-850:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'='</span> ]
-851:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&gt;'</span>
-852:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&gt;='</span> ] <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
-853:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-854:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&gt;'</span> ]
-855:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>
-856:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&lt;='</span> ] <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
-857:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-858:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&lt;'</span> ]
-859:       <span class="ruby-keyword kw">else</span>
-860:         <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unsupported operator #{c}&quot;</span>
-861:       <span class="ruby-keyword kw">end</span>
-862:     <span class="ruby-keyword kw">end</span>
-863: 
-864:     <span class="ruby-comment cmt"># Read only decimal digits and return the result als Fixnum.</span>
-865:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readDigits</span>
-866:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-867:       <span class="ruby-keyword kw">while</span> (<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>) <span class="ruby-operator">===</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>)
-868:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-869:       <span class="ruby-keyword kw">end</span>
-870:       <span class="ruby-comment cmt"># Make sure that we have read at least one digit.</span>
-871:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">token</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;&quot;</span>
-872:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Digit (0 - 9) expected&quot;</span>
-873:       <span class="ruby-keyword kw">end</span>
-874:       <span class="ruby-comment cmt"># Push back the non-digit that terminated the digits.</span>
-875:       <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-876:       <span class="ruby-identifier">token</span>
-877:     <span class="ruby-keyword kw">end</span>
-878: 
-879:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readIdentifier</span>(<span class="ruby-identifier">noDigit</span> = <span class="ruby-keyword kw">true</span>)
-880:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-881:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span>
-882:             ((<span class="ruby-value str">'a'</span><span class="ruby-operator">..</span><span class="ruby-value str">'z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span> (<span class="ruby-value str">'A'</span><span class="ruby-operator">..</span><span class="ruby-value str">'Z'</span>) <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">||</span>
-883:              (<span class="ruby-operator">!</span><span class="ruby-identifier">noDigit</span> <span class="ruby-operator">&amp;&amp;</span> ((<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>)  <span class="ruby-operator">===</span> <span class="ruby-identifier">c</span>)) <span class="ruby-operator">||</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'_'</span>)
-884:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-885:         <span class="ruby-identifier">noDigit</span> = <span class="ruby-keyword kw">false</span>
-886:       <span class="ruby-keyword kw">end</span>
-887:       <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-888:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">token</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;&quot;</span>
-889:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Identifier expected&quot;</span>
-890:       <span class="ruby-keyword kw">end</span>
-891:       <span class="ruby-identifier">token</span>
-892:     <span class="ruby-keyword kw">end</span>
-893: 
-894:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">errorEOF</span>(<span class="ruby-identifier">no</span>, <span class="ruby-identifier">token</span>)
-895:       <span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;eof_in_istring#{no}&quot;</span>,
-896:             <span class="ruby-node">&quot;Unexpected end of file in string '#{token[0,20]}...'&quot;</span> <span class="ruby-operator">+</span>
-897:             <span class="ruby-node">&quot;starting in line #{@startOfToken.lineNo}.&quot;</span>)
-898:     <span class="ruby-keyword kw">end</span>
-899: 
-900:   <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-acro-method" class="method-detail ">
-				<a name="M001157"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readMacro</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-acro-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 827</span>
-827:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readMacro</span>
-828:       <span class="ruby-comment cmt"># We can deal with ']' inside of the macro as long as each ']' is</span>
-829:       <span class="ruby-comment cmt"># preceeded by a corresponding '['.</span>
-830:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">''</span>
-831:       <span class="ruby-identifier">bracketLevel</span> = <span class="ruby-value">1</span>
-832:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-833:         <span class="ruby-keyword kw">case</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextCharI</span>)
-834:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
-835:           <span class="ruby-identifier">error</span>(<span class="ruby-value str">'unterminated_macro'</span>, <span class="ruby-node">&quot;Unterminated macro #{token}&quot;</span>)
-836:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'['</span>
-837:           <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
-838:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">']'</span>
-839:           <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>
-840:         <span class="ruby-keyword kw">end</span>
-841:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">bracketLevel</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
-842:       <span class="ruby-keyword kw">end</span>
-843:       <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'MACRO'</span>, <span class="ruby-identifier">token</span> ]
-844:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-umber-method" class="method-detail ">
-				<a name="M001152"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readNumber</span><span
-						class="method-args">(c)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-umber-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 564</span>
-564:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readNumber</span>(<span class="ruby-identifier">c</span>)
-565:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-566:       <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-567:       <span class="ruby-keyword kw">while</span> (<span class="ruby-value str">'0'</span><span class="ruby-operator">..</span><span class="ruby-value str">'9'</span>) <span class="ruby-operator">===</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>)
-568:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-569:       <span class="ruby-keyword kw">end</span>
-570:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'-'</span>
-571:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">readDate</span>(<span class="ruby-identifier">token</span>)
-572:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
-573:         <span class="ruby-identifier">frac</span> = <span class="ruby-identifier">readDigits</span>
-574: 
-575:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'FLOAT'</span>, <span class="ruby-identifier">token</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">frac</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">/</span> (<span class="ruby-value">10.0</span> <span class="ruby-operator">**</span> <span class="ruby-identifier">frac</span>.<span class="ruby-identifier">length</span>) ]
-576:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">':'</span>
-577:         <span class="ruby-identifier">hours</span> = <span class="ruby-identifier">token</span>.<span class="ruby-identifier">to_i</span>
-578:         <span class="ruby-identifier">mins</span> = <span class="ruby-identifier">readDigits</span>.<span class="ruby-identifier">to_i</span>
-579:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">hours</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">hours</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">24</span>
-580:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Hour must be between 0 and 23&quot;</span>
-581:         <span class="ruby-keyword kw">end</span>
-582:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mins</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">mins</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">59</span>
-583:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Minutes must be between 0 and 59&quot;</span>
-584:         <span class="ruby-keyword kw">end</span>
-585:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">hours</span> <span class="ruby-operator">==</span> <span class="ruby-value">24</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">mins</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span>
-586:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>, <span class="ruby-value str">&quot;Time may not be larger than 24:00&quot;</span>
-587:         <span class="ruby-keyword kw">end</span>
-588: 
-589:         <span class="ruby-comment cmt"># Return time as seconds of day since midnight.</span>
-590:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'TIME'</span>, <span class="ruby-identifier">hours</span> * <span class="ruby-value">60</span> * <span class="ruby-value">60</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">mins</span> * <span class="ruby-value">60</span> ]
-591:       <span class="ruby-keyword kw">else</span>
-592:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-593:       <span class="ruby-keyword kw">end</span>
-594: 
-595:       [ <span class="ruby-value str">'INTEGER'</span>, <span class="ruby-identifier">token</span>.<span class="ruby-identifier">to_i</span> ]
-596:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-perator-method" class="method-detail ">
-				<a name="M001158"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readOperator</span><span
-						class="method-args">(c)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					<p>
-Read operators of logical expressions.
-</p>
-					
-
-					
-					<div class="method-source-code"
-						id="read-perator-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 847</span>
-847:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readOperator</span>(<span class="ruby-identifier">c</span>)
-848:       <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">c</span>
-849:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'='</span>
-850:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'='</span> ]
-851:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&gt;'</span>
-852:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&gt;='</span> ] <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
-853:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-854:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&gt;'</span> ]
-855:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>
-856:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&lt;='</span> ] <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'='</span>
-857:         <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-858:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'LITERAL'</span>, <span class="ruby-value str">'&lt;'</span> ]
-859:       <span class="ruby-keyword kw">else</span>
-860:         <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unsupported operator #{c}&quot;</span>
-861:       <span class="ruby-keyword kw">end</span>
-862:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="read-tring-method" class="method-detail ">
-				<a name="M001154"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">readString</span><span
-						class="method-args">(terminator)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="read-tring-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 682</span>
-682:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">readString</span>(<span class="ruby-identifier">terminator</span>)
-683:       <span class="ruby-identifier">token</span> = <span class="ruby-value str">&quot;&quot;</span>
-684:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-identifier">terminator</span>
-685:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\\&quot;</span>
-686:           <span class="ruby-comment cmt"># Terminators can be used as regular characters when prefixed by a \.</span>
-687:           <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-identifier">terminator</span>
-688:             <span class="ruby-comment cmt"># \ followed by non-terminator. Just add both.</span>
-689:             <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot;\\&quot;</span>
-690:           <span class="ruby-keyword kw">end</span>
-691:         <span class="ruby-keyword kw">end</span>
-692:         <span class="ruby-identifier">token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-693:       <span class="ruby-keyword kw">end</span>
-694: 
-695:       [ <span class="ruby-value str">'STRING'</span>, <span class="ruby-identifier">token</span> ]
-696:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="return-har-method" class="method-detail ">
-				<a name="M001147"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">returnChar</span><span
-						class="method-args">(c)</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="return-har-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 490</span>
-490:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-491:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">nil?</span>
-492: 
-493:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">line</span>.<span class="ruby-identifier">chop!</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span>
-494:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">charBuffer</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">c</span>
-495:       <span class="ruby-ivar">@cf</span>.<span class="ruby-identifier">lineNo</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;\n&quot;</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-ivar">@macroStack</span>.<span class="ruby-identifier">empty?</span>
-496:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="skip-lus-lus-omments-method" class="method-detail ">
-				<a name="M001149"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">skipCPlusPlusComments</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="skip-lus-lus-omments-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 507</span>
-507:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">skipCPlusPlusComments</span>
-508:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'*'</span>
-509:         <span class="ruby-comment cmt"># /* */ style multi-line comment</span>
-510:         <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">true</span>
-511:         <span class="ruby-keyword kw">begin</span>
-512:           <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">!=</span> <span class="ruby-value str">'*'</span>
-513:           <span class="ruby-keyword kw">end</span>
-514:         <span class="ruby-keyword kw">end</span> <span class="ruby-keyword kw">until</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">==</span> <span class="ruby-value str">'/'</span>
-515:         <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
-516:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'/'</span>
-517:         <span class="ruby-comment cmt"># // style single line comment</span>
-518:         <span class="ruby-identifier">skipComment</span>
-519:       <span class="ruby-keyword kw">else</span>
-520:         <span class="ruby-identifier">error</span>(<span class="ruby-value str">'bad_comment'</span>, <span class="ruby-value str">&quot;'/' or '*' expected after start of comment&quot;</span>)
-521:       <span class="ruby-keyword kw">end</span>
-522:     <span class="ruby-keyword kw">end</span></pre>
-					</div>
-					
-				</div>
-
-				
-
-				
-			</div>
-
-		
-			<div id="skip-omment-method" class="method-detail ">
-				<a name="M001148"></a>
-
-				<div class="method-heading">
-				
-					<span class="method-name">skipComment</span><span
-						class="method-args">()</span>
-					<span class="method-click-advice">click to toggle source</span>
-				
-				</div>
-
-				<div class="method-description">
-					
-					
-					
-
-					
-					<div class="method-source-code"
-						id="skip-omment-source">
+						id="warning-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/TextScanner.rb, line 498</span>
-498:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">skipComment</span>
-499:       <span class="ruby-comment cmt"># Read all characters until line or file end is found</span>
-500:       <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">true</span>
-501:       <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">c</span> = <span class="ruby-identifier">nextChar</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">c</span> <span class="ruby-operator">!=</span> <span class="ruby-value str">&quot;\n&quot;</span>
-502:       <span class="ruby-keyword kw">end</span>
-503:       <span class="ruby-ivar">@ignoreMacros</span> = <span class="ruby-keyword kw">false</span>
-504:       <span class="ruby-identifier">returnChar</span>(<span class="ruby-identifier">c</span>)
-505:     <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">warning</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">sfi</span> = <span class="ruby-keyword kw">nil</span>)
+454:       <span class="ruby-identifier">message</span>(<span class="ruby-value str">'warning'</span>, <span class="ruby-identifier">id</span>, <span class="ruby-identifier">text</span>, <span class="ruby-identifier">property</span>, <span class="ruby-identifier">sfi</span>)
+455:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>