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

Removed extraneous TokenDuple object creation.

Browse source
This commit is contained in:
John Camelon 2004-05-18 18:14:09 +00:00
parent d46532a2d9
commit 09fd1318d0
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ExpressionParser.java
View file

@ -1679,7 +1679,7 @@ public class ExpressionParser implements IExpressionParser, IParserData {
{
String signature = "";//$NON-NLS-1$
if( start != null && lastToken != null )
signature = new TokenDuple( start, lastToken ).toString();
signature = TokenDuple.createStringRepresentation(start, lastToken);
return astFactory.createTypeId( scope, kind, isConst, isVolatile, isShort, isLong, isSigned, isUnsigned, isTypename, name, id.getPointerOperators(), id.getArrayModifiers(), signature);
}
catch (ASTSemanticException e)

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenDuple.java
View file

@ -191,6 +191,7 @@ public class TokenDuple implements ITokenDuple {
private static final Integer LBRACKET = new Integer( IToken.tLBRACKET );
private static final Integer LPAREN = new Integer( IToken.tLPAREN );
private String [] qualifiedName = null;
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
public IToken consumeTemplateIdArguments( IToken name, Iterator iter ){
IToken token = name;
@ -267,11 +268,11 @@ public class TokenDuple implements ITokenDuple {
}
public String toString()
public static String createStringRepresentation( IToken f, IToken l)
{
StringBuffer buff = new StringBuffer();
IToken prev = null;
IToken iter = firstToken;
IToken iter = f;
for( ; ; )
{
if( prev != null &&
@ -285,13 +286,19 @@ public class TokenDuple implements ITokenDuple {
iter.getType() != IToken.tCOLONCOLON )
buff.append( ' ');
if( iter == null ) return EMPTY_STRING;
buff.append( iter.getImage() );
if( iter == lastToken ) break;
if( iter == l ) break;
prev = iter;
iter = iter.getNext();
}
return buff.toString().trim();
return buff.toString();
}
public String toString()
{
return createStringRepresentation(firstToken, lastToken);
}
public boolean isIdentifier()
@ -533,4 +540,5 @@ public class TokenDuple implements ITokenDuple {
qualifiedName = (String[]) qn.toArray( qualifiedName );
}
}