mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-30 21:55:31 +02:00
Code Issues Wiki Activity

Removed two redundant checks flagged by the compiler.

Browse source
This commit is contained in:
Sergey Prigogin 2008-03-29 17:05:58 +00:00
parent fa7e6e8363
commit 56cf847c2a
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
View file

@ -784,34 +784,34 @@ public class CPPSemantics {
if( inherited != null ){
if( result == null ){
result = inherited;
} else if ( inherited != null ) {
if( !data.contentAssist ) {
if( result instanceof Object [] ){
Object [] r = (Object[]) result;
for( int j = 0; j < r.length && r[j] != null; j++ ) {
if( checkForAmbiguity( data, r[j], inherited ) ){
data.problem = new ProblemBinding( data.astName, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, data.name() );
return null;
}
}
} else {
if( checkForAmbiguity( data, result, inherited ) ){
data.problem = new ProblemBinding( data.astName, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, data.name() );
} else if( !data.contentAssist ) {
if( result instanceof Object [] ){
Object [] r = (Object[]) result;
for( int j = 0; j < r.length && r[j] != null; j++ ) {
if( checkForAmbiguity( data, r[j], inherited ) ){
data.problem = new ProblemBinding( data.astName,
IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, data.name() );
return null;
}
}
} else {
CharArrayObjectMap temp = (CharArrayObjectMap) inherited;
CharArrayObjectMap r = (CharArrayObjectMap) result;
char[] key = null;
int tempSize = temp.size();
for( int ii = 0; ii < tempSize; ii++ ){
key = temp.keyAt( ii );
if( !r.containsKey( key ) ){
r.put( key, temp.get(key) );
} else {
//TODO: prefixLookup ambiguity checking
}
if( checkForAmbiguity( data, result, inherited ) ){
data.problem = new ProblemBinding( data.astName,
IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, data.name() );
return null;
}
}
} else {
CharArrayObjectMap temp = (CharArrayObjectMap) inherited;
CharArrayObjectMap r = (CharArrayObjectMap) result;
char[] key = null;
int tempSize = temp.size();
for( int ii = 0; ii < tempSize; ii++ ){
key = temp.keyAt( ii );
if( !r.containsKey( key ) ){
r.put( key, temp.get(key) );
} else {
//TODO: prefixLookup ambiguity checking
}
}
}
@ -2077,7 +2077,7 @@ public class CPPSemantics {
type = (IType) o;
while( type != null ){
type = (type != null) ? getUltimateType( type, false ) : null;
type = getUltimateType( type, false );
if( type == null || !( type instanceof IFunctionType ) )
return new ProblemBinding( data.astName, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, data.name() );
@ -2450,5 +2450,4 @@ public class CPPSemantics {
}
return false;
}
}