<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;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#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 {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;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="5">Commit in <b><tt>metaas/trunk/src</tt></b></td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/antlr/<a href="#file1">LinkedListTokenStream.java</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">585 -> 586</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/impl/antlr/<a href="#file2">LinkedListTokenStreamTest.java</a></tt> </td><td></td><td align="right" id="added">+27</td><td></td><td nowrap="nowrap" align="center">585 -> 586</td></tr>
<tr><td></td><td></td><td align="right" id="added">+28</td><td align="right" id="removed">-1</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Fix rewind() breakage when mark() called while a read of the next token from the TokenStream is still pending (i.e. this.p == null)
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/antlr</span><br />
<div class="fileheader"><big><b>LinkedListTokenStream.java</b></big> <small id="info">585 -> 586</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/antlr/LinkedListTokenStream.java 2008-01-13 21:10:17 UTC (rev 585)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/antlr/LinkedListTokenStream.java 2008-01-13 21:16:04 UTC (rev 586)
@@ -235,7 +235,7 @@
</small></pre><pre class="diff" id="context">
public int mark() {
// TODO: could store marks in a hash; does it make any difference?
</pre><pre class="diff" id="removed">- lastMarker = p;
</pre><pre class="diff" id="added">+ lastMarker = (LinkedListToken)LT(1);
</pre><pre class="diff" id="context"> return index();
}
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas/impl/antlr</span><br />
<div class="fileheader"><big><b>LinkedListTokenStreamTest.java</b></big> <small id="info">585 -> 586</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/impl/antlr/LinkedListTokenStreamTest.java 2008-01-13 21:10:17 UTC (rev 585)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/impl/antlr/LinkedListTokenStreamTest.java 2008-01-13 21:16:04 UTC (rev 586)
@@ -1,9 +1,13 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas.impl.antlr;
</pre><pre class="diff" id="added">+import org.antlr.runtime.ANTLRStringStream;
</pre><pre class="diff" id="context"> import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonToken;
import org.antlr.runtime.Token;
import org.antlr.runtime.TokenSource;
</pre><pre class="diff" id="added">+import org.asdt.core.internal.antlr.AS3Lexer;
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.impl.ASTUtils;
</pre><pre class="diff" id="context"> import junit.framework.TestCase;
public class LinkedListTokenStreamTest extends TestCase {
</pre><pre class="diff"><small id="info">@@ -39,4 +43,27 @@
</small></pre><pre class="diff" id="context"> stream.consume();
return tok;
}
</pre><pre class="diff" id="added">+
+ public void testMarkRewind() {
+ ANTLRStringStream input = new ANTLRStringStream("package { b");
+ AS3Lexer lex = new AS3Lexer(input);
+ LinkedListTokenSource src = new LinkedListTokenSource(lex);
+ LinkedListTokenStream str = new LinkedListTokenStream(src);
+
+ ASTUtils.assertAS3TokenTypeIs(AS3Parser.PACKAGE, str.LA(1));
+ str.consume();
+ ASTUtils.assertAS3TokenTypeIs(AS3Parser.LCURLY, str.LA(1));
+ int mark = str.mark();
+ assertEquals(2, mark);
+ str.consume();
+ ASTUtils.assertAS3TokenTypeIs(AS3Parser.IDENT, str.LA(1));
+
+ str.rewind(mark);
+ ASTUtils.assertAS3TokenTypeIs(AS3Parser.LCURLY, str.LA(1));
+ str.consume();
+
+ // no-args version should just go back to last mark
+ str.rewind();
+ assertEquals(mark, str.index());
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>