forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

CommonTokenStream now extends BufferedTokenStream<Token> instead of BufferedTokenStream<CommonToken>. Token interface provides the same information and the change helps the work on improving generics.

This commit is contained in:
Sam Harwell 2012-02-23 11:21:22 -06:00
parent d7dbef2782
commit 7dcb148d73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/Java/src/org/antlr/v4/runtime/CommonTokenStream.java
View File

@ -46,7 +46,7 @@ package org.antlr.v4.runtime;
* @see UnbufferedTokenStream
* @see BufferedTokenStream
*/
public class CommonTokenStream extends BufferedTokenStream<CommonToken> {
public class CommonTokenStream extends BufferedTokenStream<Token> {
/** Skip tokens on any channel but this one; this is how we skip whitespace... */
protected int channel = Token.DEFAULT_CHANNEL;
@ -67,7 +67,7 @@ public class CommonTokenStream extends BufferedTokenStream<CommonToken> {
if ( p == -1 ) setup();
p++;
sync(p);
CommonToken t = tokens.get(p);
Token t = tokens.get(p);
while ( t.getType()!=Token.EOF && t.getChannel()!=channel ) {
p++;
sync(p);
@ -90,7 +90,7 @@ public class CommonTokenStream extends BufferedTokenStream<CommonToken> {
}
@Override
protected CommonToken LB(int k) {
protected Token LB(int k) {
if ( k==0 || (p-k)<0 ) return null;
int i = p;
@ -106,7 +106,7 @@ public class CommonTokenStream extends BufferedTokenStream<CommonToken> {
}
@Override
public CommonToken LT(int k) {
public Token LT(int k) {
//System.out.println("enter LT("+k+")");
if ( p == -1 ) setup();
if ( k == 0 ) return null;