mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 18:25:40 +02:00
Code Issues Wiki Activity

Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=68409

Browse source
This commit is contained in:
John Camelon 2004-06-24 21:21:19 +00:00
parent 8a44263910
commit 97dcd10e64
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/ASTElaboratedTypeSpecifier.java
View file

@ -186,4 +186,25 @@ public class ASTElaboratedTypeSpecifier extends ASTSymbol implements IASTElabora
public int getNameLineNumber() { public int getNameLineNumber() {
return offsets.getNameLineNumber(); return offsets.getNameLineNumber();
} }
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object obj) {
if( obj == null ) return false;
if( ! (obj instanceof IASTElaboratedTypeSpecifier )) return false;
IASTElaboratedTypeSpecifier elab = (IASTElaboratedTypeSpecifier) obj;
if( elab.getClassKind() != getClassKind() ) return false;
if( elab.getName() != getName() ) return false;
return true;
}
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
String coded =getName().toString();
return coded.hashCode();
}
} }

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
View file

@ -3251,7 +3251,8 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
checkSymbol = ((ITemplateSymbol)checkSymbol).getTemplatedSymbol(); checkSymbol = ((ITemplateSymbol)checkSymbol).getTemplatedSymbol();
} }
if (checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTClassSpecifier if (checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTClassSpecifier
|| checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTEnumerationSpecifier) { || checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTEnumerationSpecifier ||
checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTElaboratedTypeSpecifier ) {
ASTElaboratedTypeSpecifier elab = new ASTElaboratedTypeSpecifier( ASTElaboratedTypeSpecifier elab = new ASTElaboratedTypeSpecifier(
checkSymbol, kind, startingOffset, startingLine, name checkSymbol, kind, startingOffset, startingLine, name
.getFirstToken().getOffset(), name .getFirstToken().getOffset(), name
@ -3261,9 +3262,6 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
attachSymbolExtension(checkSymbol, elab, !isForewardDecl); attachSymbolExtension(checkSymbol, elab, !isForewardDecl);
return elab; return elab;
} }
if (checkSymbol.getASTExtension().getPrimaryDeclaration() instanceof IASTElaboratedTypeSpecifier)
return (IASTElaboratedTypeSpecifier) checkSymbol
.getASTExtension().getPrimaryDeclaration();
} else { } else {
handleProblem(IProblem.SEMANTIC_NAME_NOT_FOUND, newSymbolName, handleProblem(IProblem.SEMANTIC_NAME_NOT_FOUND, newSymbolName,
nameToken.getOffset(), nameToken.getEndOffset(), nameToken nameToken.getOffset(), nameToken.getEndOffset(), nameToken

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenFactory.java
View file

@ -58,7 +58,8 @@ public class TokenFactory {
public static ITokenDuple createTokenDuple( IToken first, IToken last, List templateArgLists ) public static ITokenDuple createTokenDuple( IToken first, IToken last, List templateArgLists )
{ {
if( (first == last) && ( templateArgLists == null ) && ( first instanceof ITokenDuple )) return (ITokenDuple) first; if( (first == last) && ( templateArgLists == null ) && ( first instanceof ITokenDuple ))
return (ITokenDuple) first;
if( templateArgLists != null && !templateArgLists.isEmpty()) if( templateArgLists != null && !templateArgLists.isEmpty())
return new TemplateTokenDuple( first, last, templateArgLists ); return new TemplateTokenDuple( first, last, templateArgLists );
return new BasicTokenDuple( first, last ); return new BasicTokenDuple( first, last );