[as2api-dev] [CVS trunk] Don't let a SingleLineCommentToken eat its terminating
end-of-line sequence.
David Holroyd
dave at badgers-in-foil.co.uk
Sun, 03 Jul 2005 20:17:46 +0000
<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>parse/<a href="#file1">lexer.rb</a></tt></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=182&content-type=text/vnd.viewcvs-markup">182</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb.diff?r1=182&r2=183">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=183&content-type=text/vnd.viewcvs-markup">183</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">tc_actionscript_lexer.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=182&content-type=text/vnd.viewcvs-markup">182</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb.diff?r1=182&r2=183">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=183&content-type=text/vnd.viewcvs-markup">183</a></td></tr>
<tr><td></td><td align="right" id="added">+3</td><td align="right" id="removed">-2</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Don't let a SingleLineCommentToken eat its terminating end-of-line sequence.
This will now appear as an additional WhiteSpaceToken.
Applications that care about whitespace will need this.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk">trunk</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api">as2api</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse">parse</a></span><br />
<div class="fileheader"><big><b>lexer.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=182&content-type=text/vnd.viewcvs-markup">182</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb.diff?r1=182&r2=183">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=183&content-type=text/vnd.viewcvs-markup">183</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/lexer.rb 2005-07-03 20:11:50 UTC (rev 182)
+++ trunk/as2api/parse/lexer.rb 2005-07-03 20:17:44 UTC (rev 183)
@@ -257,7 +257,7 @@
</small></pre><pre class="diff" id="context"> escape = "(?:#{unicode}|\\\\[ -~\\200-\\377])"
nmstart = "(?:[a-zA-Z_$]|#{nonascii}|#{escape})"
nmchar = "(?:[a-zA-Z0-9_$]|#{nonascii}|#{escape})"
</pre><pre class="diff" id="removed">- SINGLE_LINE_COMMENT = "//([^\n\r]*)<span id="removedchars">(?:\r\n|\r|\n)?</span>"
</pre><pre class="diff" id="added">+ SINGLE_LINE_COMMENT = "//([^\n\r]*)"
</pre><pre class="diff" id="context"> OMULTI_LINE_COMMENT = "/\\*"
CMULTI_LINE_COMMENT = "\\*/"
STRING_START1 = "'"
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk">trunk</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api">as2api</a></span><br />
<div class="fileheader"><big><b>tc_actionscript_lexer.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=182&content-type=text/vnd.viewcvs-markup">182</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb.diff?r1=182&r2=183">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=183&content-type=text/vnd.viewcvs-markup">183</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/tc_actionscript_lexer.rb 2005-07-03 20:11:50 UTC (rev 182)
+++ trunk/as2api/tc_actionscript_lexer.rb 2005-07-03 20:17:44 UTC (rev 183)
@@ -31,7 +31,8 @@
</small></pre><pre class="diff" id="context"> def test_single_line_comment
assert_lex_to("// foo ", SingleLineCommentToken.new(" foo ", 1))
# 'single line' comments shouldn't eat the whole body of a Mac-format file
</pre><pre class="diff" id="removed">- assert_lex_to("//foo\r", SingleLineCommentToken.new("foo", 1)<span id="removedchars">)</span>
</pre><pre class="diff" id="added">+ assert_lex_to("//foo\r", SingleLineCommentToken.new("foo", 1)<span id="addedchars">,</span>
+ WhitespaceToken.new("\r", 1))
</pre><pre class="diff" id="context"> end
def test_multiline_comment
</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>