1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Further token refactoring.

This commit is contained in:
John Camelon 2005-04-19 21:04:12 +00:00
parent 1356ff71b3
commit d1d1ba386a

View file

@ -289,12 +289,12 @@ public class DOMScanner extends BaseScanner {
* @return * @return
*/ */
protected IToken newToken(int signal) { protected IToken newToken(int signal) {
return new SimpleToken2(signal, return new _BasicToken(signal,
resolveOffset(bufferPos[bufferStackPos] + 1)); resolveOffset(bufferPos[bufferStackPos] + 1));
} }
protected IToken newToken(int signal, char[] buffer) { protected IToken newToken(int signal, char[] buffer) {
IToken i = new ImagedToken2(signal, buffer, IToken i = new _ImagedToken(signal, buffer,
resolveOffset(bufferPos[bufferStackPos] + 1)); resolveOffset(bufferPos[bufferStackPos] + 1));
if (buffer != null && buffer.length == 0 && signal != IToken.tSTRING if (buffer != null && buffer.length == 0 && signal != IToken.tSTRING
&& signal != IToken.tLSTRING) && signal != IToken.tLSTRING)
@ -458,9 +458,9 @@ public class DOMScanner extends BaseScanner {
return reader; return reader;
} }
public static class SimpleToken2 implements IToken, ITokenDuple { private static class _BasicToken implements IToken, ITokenDuple {
public SimpleToken2( int type, int endOffset ) public _BasicToken( int type, int endOffset )
{ {
setType( type ); setType( type );
setOffsetByLength( endOffset ); setOffsetByLength( endOffset );
@ -717,7 +717,7 @@ public class DOMScanner extends BaseScanner {
*/ */
public Object next() { public Object next() {
hasNext = false; hasNext = false;
return SimpleToken2.this; return _BasicToken.this;
} }
} }
@ -1092,11 +1092,11 @@ public class DOMScanner extends BaseScanner {
} }
public static class ImagedToken2 extends SimpleToken2 { private static class _ImagedToken extends _BasicToken {
private char [] image = null; private char [] image = null;
public ImagedToken2( int t, char[] i, int endOffset ) { public _ImagedToken( int t, char[] i, int endOffset ) {
super( t, 0 ); super( t, 0 );
setImage(i); setImage(i);
setOffsetByLength( endOffset ); setOffsetByLength( endOffset );
@ -1144,7 +1144,7 @@ public class DOMScanner extends BaseScanner {
} }
static public char[] getCharImage( int type ){ static char[] getCharImage( int type ){
switch ( type ) { switch ( type ) {
case IToken.tCOLONCOLON : return Keywords.cpCOLONCOLON; case IToken.tCOLONCOLON : return Keywords.cpCOLONCOLON;
case IToken.tCOLON : return Keywords.cpCOLON; case IToken.tCOLON : return Keywords.cpCOLON;