<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>trunk/as2api</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">api_loader.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr class="alt"><td><tt><a href="#file2">doc_comment.rb</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr><td><tt>parse/<a href="#file3">aslexer.rb</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">doccomment_lexer.rb</a></tt></td><td align="right" id="added">+13</td><td align="right" id="removed">-13</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr><td><tt> /<a href="#file5">doccomment_parser.rb</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">lexer.rb</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">248 -> 249</td></tr>
<tr><td></td><td align="right" id="added">+24</td><td align="right" id="removed">-23</td><td></td></tr>
</table>
<small id="info">6 modified files</small><br />
<pre class="comment">
Prevent tokens for comment-lexer and AS-lexer clashing
by defining them in different modules. This does away with some warnings
about redefined constants at startup.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>api_loader.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_loader.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/api_loader.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -252,8 +252,8 @@
</small></pre><pre class="diff" id="context">
input = StringIO.new(comment_token.body)
input.lineno = comment_token.lineno
</pre><pre class="diff" id="removed">- lexer = ActionScript::Parse::DocCommentLexer.new(input)
- parser = ActionScript::Parse::DocCommentParser.new(lexer)
</pre><pre class="diff" id="added">+ lexer = ActionScript::ParseDoc::DocCommentLexer.new(input)
+ parser = ActionScript::ParseDoc::DocCommentParser.new(lexer)
</pre><pre class="diff" id="context"> handler = OurDocCommentHandler.new(comment_data, config, @type_resolver)
parser.handler = handler
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>doc_comment.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/doc_comment.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/doc_comment.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -84,7 +84,7 @@
</small></pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="removed">-class OurDocCommentHandler < ActionScript::Parse::DocCommentHandler
</pre><pre class="diff" id="added">+class OurDocCommentHandler < ActionScript::Parse<span id="addedchars">Doc</span>::DocCommentHandler
</pre><pre class="diff" id="context"> def initialize(comment_data, handler_config, type_resolver)
@comment_data = comment_data
@handler_config = handler_config
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">trunk/as2api/parse</span><br />
<div class="fileheader"><big><b>aslexer.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/aslexer.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/parse/aslexer.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -294,7 +294,7 @@
</small></pre><pre class="diff" id="context"> end
def self.build_lexer
</pre><pre class="diff" id="removed">- builder = LexerBuilder.new
</pre><pre class="diff" id="added">+ builder = LexerBuilder.new(ActionScript::Parse)
</pre><pre class="diff" id="context">
# TODO: whitespace tokens don't span lines, which might not be the expected
# behaviour
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">trunk/as2api/parse</span><br />
<div class="fileheader"><big><b>doccomment_lexer.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/doccomment_lexer.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/parse/doccomment_lexer.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -2,43 +2,43 @@
</small></pre><pre class="diff" id="context"> require 'parse/lexer'
module ActionScript
</pre><pre class="diff" id="removed">-module Parse
</pre><pre class="diff" id="added">+module Parse<span id="addedchars">Doc</span>
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">-class DocWhitespaceToken < ASToken
</pre><pre class="diff" id="added">+class WhitespaceToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-class EndOfLineToken < ASToken
</pre><pre class="diff" id="added">+class EndOfLineToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-class StarsToken < ASToken
</pre><pre class="diff" id="added">+class StarsToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-class ParaAtTagToken < ASToken
</pre><pre class="diff" id="added">+class ParaAtTagToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> def to_s
"@#{@body}"
end
end
</pre><pre class="diff" id="removed">-class InlineAtTagToken < ASToken
</pre><pre class="diff" id="added">+class InlineAtTagToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> def to_s
"{@#{@body}"
end
end
</pre><pre class="diff" id="removed">-class WordToken < ASToken
</pre><pre class="diff" id="added">+class WordToken < ActionScript::Parse::ASToken
</pre><pre class="diff" id="context"> end
</pre><pre class="diff" id="removed">-class DocCommentLexer < AbstractLexer
</pre><pre class="diff" id="added">+class DocCommentLexer < ActionScript::Parse::AbstractLexer
</pre><pre class="diff" id="context"> def lex_simple_token(class_sym, match, io)
</pre><pre class="diff" id="removed">- ActionScript::Parse.const_get(class_sym).new(io.lineno-1)
</pre><pre class="diff" id="added">+ ActionScript::Parse<span id="addedchars">Doc</span>.const_get(class_sym).new(io.lineno-1)
</pre><pre class="diff" id="context"> end
def lex_simplebody_token(class_sym, match, io)
</pre><pre class="diff" id="removed">- ActionScript::Parse.const_get(class_sym).new(match[0], io.lineno-1)
</pre><pre class="diff" id="added">+ ActionScript::Parse<span id="addedchars">Doc</span>.const_get(class_sym).new(match[0], io.lineno-1)
</pre><pre class="diff" id="context"> end
def lex_simplecapture_token(class_sym, match, io)
</pre><pre class="diff" id="removed">- ActionScript::Parse.const_get(class_sym).new(match[1], io.lineno-1)
</pre><pre class="diff" id="added">+ ActionScript::Parse<span id="addedchars">Doc</span>.const_get(class_sym).new(match[1], io.lineno-1)
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -50,10 +50,10 @@
</small></pre><pre class="diff" id="context"> WORD = "[^ \t\f\n\r}{]+"
def self.build_doc_lexer
</pre><pre class="diff" id="removed">- builder = LexerBuilder.new
</pre><pre class="diff" id="added">+ builder = ActionScript::Parse::LexerBuilder.new(ActionScript::ParseDoc)
</pre><pre class="diff" id="context">
builder.add_match(WHITESPACE_THEN_STARS, :lex_simplebody_token, :StarsToken)
</pre><pre class="diff" id="removed">- builder.add_match(DOC_WHITESPACE, :lex_simplebody_token, :<span id="removedchars">Doc</span>WhitespaceToken)
</pre><pre class="diff" id="added">+ builder.add_match(DOC_WHITESPACE, :lex_simplebody_token, :WhitespaceToken)
</pre><pre class="diff" id="context"> builder.add_match(END_OF_LINE, :lex_simplebody_token, :EndOfLineToken)
builder.add_match(AT_INLINE_TAG, :lex_simplecapture_token, :InlineAtTagToken)
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">trunk/as2api/parse</span><br />
<div class="fileheader"><big><b>doccomment_parser.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/doccomment_parser.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/parse/doccomment_parser.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -1,6 +1,6 @@
</small></pre><pre class="diff" id="context">
module ActionScript
</pre><pre class="diff" id="removed">-module Parse
</pre><pre class="diff" id="added">+module Parse<span id="addedchars">Doc</span>
</pre><pre class="diff" id="context">
</pre><pre class="diff"><small id="info">@@ -43,8 +43,8 @@
</small></pre><pre class="diff" id="context"> end
def parse_whitespace
</pre><pre class="diff" id="removed">- if lookahead?(DocWhitespaceToken)
- eat_text_token_of_kind(DocWhitespaceToken)
</pre><pre class="diff" id="added">+ if lookahead?(WhitespaceToken)
+ eat_text_token_of_kind(WhitespaceToken)
</pre><pre class="diff" id="context"> end
end
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">trunk/as2api/parse</span><br />
<div class="fileheader"><big><b>lexer.rb</b></big> <small id="info">248 -> 249</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/lexer.rb 2005-11-06 21:35:42 UTC (rev 248)
+++ trunk/as2api/parse/lexer.rb 2005-11-06 23:26:39 UTC (rev 249)
@@ -74,8 +74,9 @@
</small></pre><pre class="diff" id="context"> # the fist match wins), and to cope with keyword/identifier ambiguity
# (keywords have '\b' regexp-lookahead appended)
</pre><pre class="diff" id="removed">- def initialize
</pre><pre class="diff" id="added">+ def initialize(token_module)
</pre><pre class="diff" id="context"> @matches = []
</pre><pre class="diff" id="added">+ @token_module = token_module
</pre><pre class="diff" id="context"> end
def make_match(match)
</pre><pre class="diff"><small id="info">@@ -93,7 +94,7 @@
</small></pre><pre class="diff" id="context"> super("#{name}", lineno)
end
EOE
</pre><pre class="diff" id="removed">- <span id="removedchars">ActionScript::Pars</span>e.const_set("#{name.capitalize}Token".to_sym, the_class)
</pre><pre class="diff" id="added">+ <span id="addedchars">@token_modul</span>e.const_set("#{name.capitalize}Token".to_sym, the_class)
</pre><pre class="diff" id="context"> end
def make_simple_token(name, value, match)
</pre><pre class="diff"><small id="info">@@ -104,7 +105,7 @@
</small></pre><pre class="diff" id="context"> super("#{value}", lineno)
end
EOE
</pre><pre class="diff" id="removed">- <span id="removedchars">ActionScript::Pars</span>e.const_set(class_name, the_class)
</pre><pre class="diff" id="added">+ <span id="addedchars">@token_modul</span>e.const_set(class_name, the_class)
</pre><pre class="diff" id="context">
add_match(match, :lex_simple_token, class_name.to_sym)
end
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.11</small></center>
</body></html>